diff --git a/Block/Customer/CardRenderer.php b/Block/Customer/CardRenderer.php
index 67e1a4c3e..effd249f7 100755
--- a/Block/Customer/CardRenderer.php
+++ b/Block/Customer/CardRenderer.php
@@ -11,10 +11,10 @@
 namespace CheckoutCom\Magento2\Block\Customer;
 
 use Magento\Payment\Model\CcConfigProvider;
-use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
 use Magento\Framework\View\Element\Template;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Block\AbstractCardRenderer;
+use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
 use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
 
 class CardRenderer extends AbstractCardRenderer {
@@ -31,7 +31,12 @@ class CardRenderer extends AbstractCardRenderer {
      * @param GatewayConfig $gatewayConfig
      * @param array $data
      */
-    public function __construct(Template\Context $context, CcConfigProvider $iconsProvider, GatewayConfig $gatewayConfig, array $data) {
+    public function __construct(
+        Template\Context $context,
+        CcConfigProvider $iconsProvider,
+        GatewayConfig $gatewayConfig,
+        array $data
+    ) {
         parent::__construct($context, $iconsProvider, $data);
 
         $this->gatewayConfig = $gatewayConfig;
diff --git a/Controller/Payment/PlaceOrder.php b/Controller/Payment/PlaceOrder.php
index c869903ee..cdc3f8a2c 100755
--- a/Controller/Payment/PlaceOrder.php
+++ b/Controller/Payment/PlaceOrder.php
@@ -11,18 +11,33 @@
 namespace CheckoutCom\Magento2\Controller\Payment;
 
 use Magento\Framework\App\Action\Context;
-use Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Model\Session as CustomerSession;
 use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
 use CheckoutCom\Magento2\Model\Service\OrderService;
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
+use Magento\Sales\Model\Order\Payment\Transaction;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
+use CheckoutCom\Magento2\Model\Service\TokenChargeService;
 
 class PlaceOrder extends AbstractAction {
 
     /**
-     * @var Session
+     * @var TokenChargeService
      */
-    protected $session;
+    protected $tokenChargeService;
+
+    /**
+     * @var CheckoutSession
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var OrderInterface
+     */
+    protected $orderInterface;
 
     /**
      * @var OrderService
@@ -37,16 +52,29 @@ class PlaceOrder extends AbstractAction {
     /**
      * PlaceOrder constructor.
      * @param Context $context
-     * @param Session $session
+     * @param CheckoutSession $checkoutSession
      * @param GatewayConfig $gatewayConfig
+     * @param OrderInterface $orderInterface
      * @param OrderService $orderService
+     * @param Order $orderManager
+     * @param OrderSender $orderSender
      */
-    public function __construct(Context $context, Session $session, GatewayConfig $gatewayConfig, OrderService $orderService, CustomerSession $customerSession) {
+    public function __construct(
+        Context $context,
+        CheckoutSession $checkoutSession,
+        GatewayConfig $gatewayConfig,
+        OrderService $orderService,
+        OrderInterface $orderInterface,
+        CustomerSession $customerSession,
+        TokenChargeService $tokenChargeService
+    ) {
         parent::__construct($context, $gatewayConfig);
 
-        $this->session          = $session;
-        $this->customerSession  = $customerSession;
-        $this->orderService     = $orderService;
+        $this->checkoutSession        = $checkoutSession;
+        $this->customerSession        = $customerSession;
+        $this->orderService           = $orderService;
+        $this->orderInterface         = $orderInterface;
+        $this->tokenChargeService     = $tokenChargeService;
     }
 
     /**
@@ -55,31 +83,64 @@ public function __construct(Context $context, Session $session, GatewayConfig $g
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute() {
+
         // Retrieve the request parameters
-        $resultRedirect = $this->getResultRedirect();
-        $cardToken      = $this->getRequest()->getParam('cko-card-token');
-        $email          = $this->getRequest()->getParam('cko-context-id');
-        $agreement      = array_keys($this->getRequest()->getPostValue('agreement', []));
-        $quote          = $this->session->getQuote();
+        $params = array(
+            'cardToken' => $this->getRequest()->getParam('cko-card-token'),
+            'email' => $this->getRequest()->getParam('cko-context-id'),
+            'agreement' => array_keys($this->getRequest()->getPostValue('agreement', [])),
+            'quote' => $this->checkoutSession->getQuote()
+        );
+
+        $order = null;
+        if (isset($this->customerSession->getData('checkoutSessionData')['orderTrackId'])) {
+            $order = $this->orderInterface->loadByIncrementId($this->customerSession->getData('checkoutSessionData')['orderTrackId']);
+        }
+
+        if ($order) {
+            $this->updateOrder($params, $order);
+        }
+        else {
+            $this->createOrder($params);
+        }
+    }
+
+    public function updateOrder($params, $order) {
+
+        // Create the charge for order already placed
+        $updateSuccess = $this->tokenChargeService->sendChargeRequest($params['cardToken'], $order);
+
+        // Update payment data
+        $order = $this->updatePaymentData($order);
+        
+        // 3D Secure redirection if needed
+        if($this->gatewayConfig->isVerify3DSecure()) {
+            $this->place3DSecureRedirectUrl();
+            exit();
+        }
+
+        return $this->_redirect('checkout/onepage/success', ['_secure' => true]);
+    }
+
+    public function createOrder($params) {
 
         // Check for guest email
-        if ($quote->getCustomerEmail() === null
+        if ($params['quote']->getCustomerEmail() === null
             && $this->customerSession->isLoggedIn() === false
             && isset($this->customerSession->getData('checkoutSessionData')['customerEmail'])
-            && $this->customerSession->getData('checkoutSessionData')['customerEmail'] === $email) 
+            && $this->customerSession->getData('checkoutSessionData')['customerEmail'] === $params['email']) 
         {
-            $quote->setCustomerId(null)
-            ->setCustomerEmail($email)
+            $params['quote']->setCustomerId(null)
+            ->setCustomerEmail($params['email'])
             ->setCustomerIsGuest(true)
             ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID);
         }
 
         // Perform quote and order validation
         try {
-
             // Create an order from the quote
-            $this->validateQuote($quote);
-            $this->orderService->execute($quote, $cardToken, $agreement);
+            $this->validateQuote($params['quote']);
+            $this->orderService->execute($params['quote'], $params['cardToken'], $params['agreement']);
 
             // 3D Secure redirection if needed
             if($this->gatewayConfig->isVerify3DSecure()) {
@@ -87,13 +148,25 @@ public function execute() {
                 exit();
             }
 
-            return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
+            return $this->_redirect('checkout/onepage/success', ['_secure' => true]);
 
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage($e, $e->getMessage());
         }
 
-        return $resultRedirect->setPath('checkout/cart', ['_secure' => true]);
+        return $this->_redirect('checkout/cart', ['_secure' => true]);
+    }
+
+    public function updatePaymentData($order) {
+        // Load payment object
+        $payment = $order->getPayment();
+
+        // Set the payment method, previously "substitution" for pre auth order creation
+        $payment->setMethod(ConfigProvider::CODE); 
+        $payment->save();
+        $order->save();
+
+        return $order;
     }
 
     /**
@@ -104,7 +177,7 @@ public function execute() {
     public function place3DSecureRedirectUrl() {
         echo '<script type="text/javascript">';
         echo 'function waitForElement() {';
-        echo 'var redirectUrl = "' . $this->session->get3DSRedirect() . '";';
+        echo 'var redirectUrl = "' . $this->checkoutSession->get3DSRedirect() . '";';
         echo 'if (redirectUrl.length != 0){ window.location.replace(redirectUrl); }';
         echo 'else { setTimeout(waitForElement, 250); }';
         echo '} ';
diff --git a/Controller/Payment/PlaceOrderAjax.php b/Controller/Payment/PlaceOrderAjax.php
new file mode 100755
index 000000000..6d174dfa8
--- /dev/null
+++ b/Controller/Payment/PlaceOrderAjax.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Controller\Payment;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Model\Session as CustomerSession;
+use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
+use CheckoutCom\Magento2\Model\Service\OrderService;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Quote\Model\QuoteManagement;
+use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
+use Magento\Framework\Controller\Result\JsonFactory;
+
+class PlaceOrderAjax extends AbstractAction {
+
+    /**
+     * @var QuoteManagement
+     */
+    protected $quoteManagement;
+
+    /**
+     * @var CheckoutSession
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var OrderService
+     */
+    protected $orderService;
+
+    /**
+     * @var CustomerSession
+     */
+    protected $customerSession;
+
+    /**
+     * @var JsonFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * PlaceOrder constructor.
+     * @param Context $context
+     * @param CheckoutSession $checkoutSession
+     * @param GatewayConfig $gatewayConfig
+     * @param OrderService $orderService
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Context $context,
+        CheckoutSession $checkoutSession,
+        GatewayConfig $gatewayConfig,
+        OrderService $orderService,
+        CustomerSession $customerSession,
+        QuoteManagement $quoteManagement, 
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context, $gatewayConfig);
+
+        $this->checkoutSession   = $checkoutSession;
+        $this->customerSession   = $customerSession;
+        $this->orderService      = $orderService;
+        $this->quoteManagement   = $quoteManagement;
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
+    /**
+     * Handles the controller method.
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function execute() {
+        // Prepare the redirection
+        $resultRedirect = $this->getResultRedirect();
+
+        // Load the customer quote
+        $quote          = $this->checkoutSession->getQuote();
+
+        // Retrieve the request parameters
+        $cardToken      = $this->getRequest()->getParam('cko-card-token');
+        $email          = $this->getRequest()->getParam('cko-context-id');
+        $agreement      = array_keys($this->getRequest()->getPostValue('agreement', []));
+
+        // Check for guest email
+        if ($quote->getCustomerEmail() === null
+            && $this->customerSession->isLoggedIn() === false
+            && isset($this->customerSession->getData('checkoutSessionData')['customerEmail'])
+        ) 
+        {
+            $quote->setCustomerId(null)
+            ->setCustomerEmail($email)
+            ->setCustomerIsGuest(true)
+            ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID)
+            ->save();
+        }
+
+        // Prepare session quote info for redirection after payment
+        $this->checkoutSession
+        ->setLastQuoteId($quote->getId())
+        ->setLastSuccessQuoteId($quote->getId())
+        ->clearHelperData();
+
+        // Set payment
+        $quote->getPayment()->setMethod('substitution');
+        $quote->collectTotals()->save();
+
+        // Create the order
+        $order = $this->quoteManagement->submit($quote);
+
+        // Prepare session order info for redirection after payment
+        if ($order) {
+            $this->checkoutSession->setLastOrderId($order->getId())
+                               ->setLastRealOrderId($order->getIncrementId())
+                               ->setLastOrderStatus($order->getStatus());
+        }
+        
+        return $this->resultJsonFactory->create()->setData([
+            'trackId' => $order->getIncrementId()
+        ]);
+    }
+}
diff --git a/Controller/Payment/Verify.php b/Controller/Payment/Verify.php
index a3b64f37e..a35cd0a1c 100755
--- a/Controller/Payment/Verify.php
+++ b/Controller/Payment/Verify.php
@@ -144,17 +144,14 @@ public function __construct(
      * @throws LocalizedException
      */
     public function execute() {
-
         // Get the payment token from response
         $paymentToken = $this->extractPaymentToken();
 
         // Finalize the process
         return $this->finalizeProcess($paymentToken);
-
     }
 
     public function finalizeProcess($paymentToken) {
-
         // Process the gateway response
         $response = $this->verifyPaymentService->verifyPayment($paymentToken);
 
@@ -162,8 +159,8 @@ public function finalizeProcess($paymentToken) {
         $this->watchdog->bark($response);
 
         // If it's an alternative payment
-        if ((int) $response['chargeMode'] == 3) {
-            if ((int) $response['responseCode'] == 10000 || (int) $response['responseCode'] == 10100) {
+        if (isset($response['chargeMode']) && (int) $response['chargeMode'] == 3) {
+            if (isset($response['responseCode']) && (int) $response['responseCode'] == 10000 || (int) $response['responseCode'] == 10100) {
 
                 // Place a local payment order
                 $this->placeLocalPaymentOrder();
@@ -173,10 +170,9 @@ public function finalizeProcess($paymentToken) {
             }
         }
 
-       // If it's a vault card id charge response
-        else if (isset($response['trackId']) && $response['udf1'] == 'cardIdCharge') {
-
-            if ((int) $response['responseCode'] == 10000) {
+        // If it's a vault card id charge response
+        else if (isset($response['udf1']) && $response['udf1'] == 'cardIdCharge') {
+            if (isset($response['responseCode']) && (int) $response['responseCode'] == 10000) {
                 $this->messageManager->addSuccessMessage( __('Order successfully processed.') );
             }
             else {
@@ -188,13 +184,12 @@ public function finalizeProcess($paymentToken) {
 
         // Else proceed normally for 3D Secure
         else {
-
-            if ($response['udf2'] == 'storeInVaultOnSuccess') {
+            if (isset($response['udf2']) && $response['udf2'] == 'storeInVaultOnSuccess') {
                 $this->vaultCardAfterThreeDSecure( $response );
             }
 
             // Check for declined transactions
-            if ($response['status'] === 'Declined') {
+            if (isset($response['status']) && $response['status'] === 'Declined') {
                 throw new LocalizedException(__('The transaction has been declined.'));
             }
 
@@ -225,7 +220,7 @@ public function placeLocalPaymentOrder() {
 
         // Set payment
         $payment = $quote->getPayment();
-        $payment->setMethod(ConfigProvider::CODE);
+        $payment->setMethod('checkmo');
         $quote->save();
 
         // Save the quote
@@ -243,17 +238,10 @@ public function placeLocalPaymentOrder() {
                                        ->setLastOrderStatus($order->getStatus());
             
                 // Update order status
-                $order->setState(\Magento\Sales\Model\Order::STATE_NEW);
-                $order->setStatus($this->gatewayConfig->getNewOrderStatus());
-
-                // Set email sent
-                $order->setEmailSent(1);
+                $order->setStatus($this->gatewayConfig->getOrderStatusCaptured());
 
                 // Save the order
                 $order->save();
-
-                // Send email
-                $this->orderSender->send($order);
             }
             
             // Redirect to the success page
diff --git a/Gateway/Config/Config.php b/Gateway/Config/Config.php
index 28c2bca32..a90644a9f 100755
--- a/Gateway/Config/Config.php
+++ b/Gateway/Config/Config.php
@@ -23,7 +23,6 @@ class Config extends BaseConfig {
     const KEY_CC_TYPES = 'cctypes';
     const KEY_USE_CVV = 'useccv';
     const KEY_COUNTRY_CREDIT_CARD = 'countrycreditcard';
-
     const KEY_INTEGRATION = 'integration';
     const KEY_PUBLIC_KEY = 'public_key';
     const KEY_SECRET_KEY = 'secret_key';
@@ -32,40 +31,36 @@ class Config extends BaseConfig {
     const KEY_AUTO_CAPTURE_TIME = 'auto_capture_time';
     const KEY_VERIFY_3DSECURE = 'verify_3dsecure';
     const KEY_ATTEMPT_N3D = 'attemptN3D';
-
     const KEY_SANDBOX_API_URL = 'sandbox_api_url';
     const KEY_LIVE_API_URL = 'live_api_url';
-
     const KEY_SANDBOX_EMBEDDED_URL = 'sandbox_embedded_url';
     const KEY_SANDBOX_HOSTED_URL = 'sandbox_hosted_url';
     const KEY_LIVE_EMBEDDED_URL = 'live_embedded_url';
     const KEY_LIVE_HOSTED_URL = 'live_hosted_url';
-
     const MIN_AUTO_CAPTURE_TIME = 0;
     const MAX_AUTO_CAPTURE_TIME = 168;
-
-    CONST KEY_USE_DESCRIPTOR = 'descriptor_enable';
+    const KEY_USE_DESCRIPTOR = 'descriptor_enable';
     const KEY_DESCRIPTOR_NAME = 'descriptor_name';
     const KEY_DESCRIPTOR_CITY = 'descriptor_city';
-
     const CODE_3DSECURE = 'three_d_secure';
-
     const KEY_THEME_COLOR = 'theme_color';
     const KEY_BUTTON_LABEL = 'button_label';
-
     const KEY_NEW_ORDER_STATUS = 'new_order_status';
+    const KEY_ORDER_STATUS_AUTHORIZED = 'order_status_authorized';
+    const KEY_ORDER_STATUS_CAPTURED = 'order_status_captured';
+    const KEY_ORDER_STATUS_REFUNDED = 'order_status_refunded';
+    const KEY_ORDER_STATUS_FLAGGED = 'order_status_flagged';
     const KEY_ACCEPTED_CURRENCIES = 'accepted_currencies';
     const KEY_PAYMENT_CURRENCY = 'payment_currency';
     const KEY_CUSTOM_CURRENCY = 'custom_currency';
     const KEY_PAYMENT_MODE = 'payment_mode';
     const KEY_AUTO_GENERATE_INVOICE = 'auto_generate_invoice';
-
     const KEY_EMBEDDED_THEME = 'embedded_theme';
     const KEY_EMBEDDED_CSS = 'embedded_css';
     const KEY_CUSTOM_CSS = 'custom_css';
     const KEY_CSS_FILE = 'css_file';
-
-    const KEY_VAULT_TITLE = 'checkout_com_cc_vault/title';
+    const KEY_ORDER_COMMENTS_OVERRIDE = 'order_comments_override';
+    const KEY_ORDER_CREATION = 'order_creation';
 
     /**
      * @var array
@@ -101,6 +96,17 @@ public function getVaultTitle() {
         return (string) $scopeConfig->getValue('payment/checkout_com_cc_vault/title');
     }
 
+    /**
+     * Returns the vault card autosave state.
+     *
+     * @return bool
+     */
+    public function isCardAutosave() {
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $scopeConfig = $objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface');     
+        return (bool) $scopeConfig->getValue('payment/checkout_com_cc_vault/autosave');
+    }
+
     /**
      * Returns the payment mode.
      *
@@ -128,6 +134,42 @@ public function getNewOrderStatus() {
         return (string) $this->getValue(self::KEY_NEW_ORDER_STATUS);
     }
 
+    /**
+     * Returns the authorized order status.
+     *
+     * @return string
+     */
+    public function getOrderStatusAuthorized() {
+        return (string) $this->getValue(self::KEY_ORDER_STATUS_AUTHORIZED);
+    }
+
+    /**
+     * Returns the captured order status.
+     *
+     * @return string
+     */
+    public function getOrderStatusCaptured() {
+        return (string) $this->getValue(self::KEY_ORDER_STATUS_CAPTURED);
+    }
+
+    /**
+     * Returns the refunded order status.
+     *
+     * @return string
+     */
+    public function getOrderStatusRefunded() {
+        return (string) $this->getValue(self::KEY_ORDER_STATUS_REFUNDED);
+    }
+
+    /**
+     * Returns the flagged order status.
+     *
+     * @return string
+     */
+    public function getOrderStatusFlagged() {
+        return (string) $this->getValue(self::KEY_ORDER_STATUS_FLAGGED);
+    }
+
     /**
      * Returns the design settings.
      *
@@ -189,6 +231,15 @@ public function isActive() {
         return (bool) in_array($quote->getQuoteCurrencyCode(), $this->getAcceptedCurrencies());
     }
 
+    /**
+     * Determines if the core order comments need override.
+     *
+     * @return bool
+     */
+    public function overrideOrderComments() {
+        return (bool) $this->getValue(self::KEY_ORDER_COMMENTS_OVERRIDE);
+    }
+
     /**
      * Determines if debug mode is enabled.
      *
@@ -370,6 +421,15 @@ public function getCssFile() {
         return (string) $this->getValue(self::KEY_CSS_FILE);
     }
 
+    /**
+     * Returns the new order creation setting.
+     *
+     * @return string
+     */
+    public function getOrderCreation() {
+        return (string) $this->getValue(self::KEY_ORDER_CREATION);
+    }
+
     /**
      * Returns the custom CSS URL for embedded integration.
      *
diff --git a/Gateway/Http/Client/AbstractTransaction.php b/Gateway/Http/Client/AbstractTransaction.php
index 98389b904..6ccf8a090 100755
--- a/Gateway/Http/Client/AbstractTransaction.php
+++ b/Gateway/Http/Client/AbstractTransaction.php
@@ -84,7 +84,16 @@ abstract class AbstractTransaction implements ClientInterface {
      * @param ManagerInterface $messageManager
      * @param GatewayResponseHolder $gatewayResponseHolder
      */
-    public function __construct(Logger $logger, ZendClient $clientFactory, ManagerInterface $messageManager, GatewayResponseHolder $gatewayResponseHolder, Cart $cart, CartManagementInterface $cartManagement, QuoteManagement $quoteManagement, CustomerSession $customerSession) {
+    public function __construct(
+        Logger $logger,
+        ZendClient $clientFactory,
+        ManagerInterface $messageManager,
+        GatewayResponseHolder $gatewayResponseHolder,
+        Cart $cart,
+        CartManagementInterface $cartManagement,
+        QuoteManagement $quoteManagement,
+        CustomerSession $customerSession
+    ) {
         $this->logger                   = $logger;
         $this->clientFactory            = $clientFactory;
         $this->messageManager           = $messageManager;
diff --git a/Gateway/Request/VaultRequest.php b/Gateway/Request/VaultRequest.php
index 183fb4805..885319c50 100755
--- a/Gateway/Request/VaultRequest.php
+++ b/Gateway/Request/VaultRequest.php
@@ -12,6 +12,7 @@
 
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 class VaultRequest implements BuilderInterface {
 
@@ -31,12 +32,18 @@ class VaultRequest implements BuilderInterface {
      */
     protected $customerSession;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
     /**
      * VaultRequest constructor.
      * @param CustomerSession $customerSession
      */
-    public function __construct(CustomerSession $customerSession) {
+    public function __construct(CustomerSession $customerSession, ScopeConfigInterface $scopeConfig) {
         $this->customerSession = $customerSession;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -54,10 +61,16 @@ public function getVaultSaveInfo() {
         // Get the checkout session data
         $checkoutSessionData = $this->customerSession->getData('checkoutSessionData');
 
+        // Get the auto save card config
+        $isAutoSave = $this->scopeConfig->getValue('payment/checkout_com_cc_vault/autosave');
+
         // Check if save card is requested
         if (isset($checkoutSessionData['saveShopperCard'])) {
             return filter_var($checkoutSessionData['saveShopperCard'], FILTER_VALIDATE_BOOLEAN);
         }
+        else if ($isAutoSave) {
+            return true;
+        }
 
         return false;
     }
diff --git a/Gateway/Response/TransactionHandler.php b/Gateway/Response/TransactionHandler.php
index 33035be40..65cd901fe 100755
--- a/Gateway/Response/TransactionHandler.php
+++ b/Gateway/Response/TransactionHandler.php
@@ -64,9 +64,16 @@ class TransactionHandler implements HandlerInterface {
 
     protected $messageManager;
 
-    public function __construct(Session $session, VaultTokenFactory $vaultTokenFactory, 
-            PaymentTokenRepositoryInterface $paymentTokenRepository, PaymentTokenManagementInterface $paymentTokenManagement, CustomerSession $customerSession, 
-ManagerInterface $messageManager, VerifyPaymentService $verifyPaymentService, Watchdog $watchdog) {
+    public function __construct(
+        Session $session,
+        VaultTokenFactory $vaultTokenFactory,
+        PaymentTokenRepositoryInterface $paymentTokenRepository,
+        PaymentTokenManagementInterface $paymentTokenManagement,
+        CustomerSession $customerSession, 
+        ManagerInterface $messageManager,
+        VerifyPaymentService $verifyPaymentService,
+        Watchdog $watchdog
+    ) {
         $this->session = $session;
         $this->vaultTokenFactory    = $vaultTokenFactory;
         $this->paymentTokenRepository   = $paymentTokenRepository;
@@ -134,7 +141,7 @@ public function handle(array $handlingSubject, array $response) {
             $payment->setIsTransactionClosed(true);
         }
 
-        // Prepare 3D Secure redirection with session variable
+        // Prepare 3D Secure redirection with session variable for post auth order
         if (array_key_exists(self::REDIRECT_URL, $response)) {
             
             // Get the 3DS redirection URL
diff --git a/Model/Adminhtml/Source/OrderCreation.php b/Model/Adminhtml/Source/OrderCreation.php
new file mode 100644
index 000000000..c69fb8bec
--- /dev/null
+++ b/Model/Adminhtml/Source/OrderCreation.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Model\Adminhtml\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+class OrderCreation implements ArrayInterface {
+
+    const BEFORE_AUTH = 'before_auth';
+    const AFTER_AUTH = 'after_auth';
+
+    /**
+     * Possible environment types
+     *
+     * @return array
+     */
+    public function toOptionArray() {
+        return [
+            [
+                'value' => self::BEFORE_AUTH,
+                'label' => 'Before authorization'
+            ],
+            [
+                'value' => self::AFTER_AUTH,
+                'label' => 'After authorization'
+            ]        
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/Model/Resource/MobilePayment.php b/Model/Resource/MobilePayment.php
index 6cc98fed2..90cc2d54c 100755
--- a/Model/Resource/MobilePayment.php
+++ b/Model/Resource/MobilePayment.php
@@ -174,7 +174,6 @@ private function prepareProductsForGateway() {
 
             // If the product id is valid
             if ((int) $product->id > 0) {
-
                 // Load the product object
                 $p = $this->productManager->load($product->id);
 
@@ -183,8 +182,6 @@ private function prepareProductsForGateway() {
                     'name' => $p->getName(),
                     'price' => number_format($p->getPrice(), 2),
                     'quantity' => (int) $product->quantity,
-                    //'description' => $p->getData('description'),
-                    //'image' => null,
                 );
             }
         }
diff --git a/Model/Service/CallbackService.php b/Model/Service/CallbackService.php
index b37d67377..1c2c822e5 100755
--- a/Model/Service/CallbackService.php
+++ b/Model/Service/CallbackService.php
@@ -10,25 +10,25 @@
 
 namespace CheckoutCom\Magento2\Model\Service;
 
+use DomainException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use CheckoutCom\Magento2\Model\Adapter\CallbackEventAdapter;
 use CheckoutCom\Magento2\Model\Adapter\ChargeAmountAdapter;
 use CheckoutCom\Magento2\Model\GatewayResponseHolder;
 use CheckoutCom\Magento2\Model\GatewayResponseTrait;
 use CheckoutCom\Magento2\Model\Method\CallbackMethod;
-use DomainException;
-
 use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
-use Magento\Sales\Model\Service\InvoiceService;
-use Magento\Sales\Model\Order\Invoice;
-use Magento\Sales\Api\InvoiceRepositoryInterface;
 use CheckoutCom\Magento2\Model\Service\StoreCardService;
-use Magento\Customer\Model\CustomerFactory;
-use Magento\Store\Model\StoreManagerInterface;
 
 class CallbackService {
 
@@ -69,10 +69,26 @@ class CallbackService {
      */
     protected $invoiceRepository;
 
+    /**
+     * @var StoreCardService
+     */
     protected $storeCardService;
+
+    /**
+     * @var CustomerFactory
+     */
     protected $customerFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
     protected $storeManager;
 
+    /**
+     * @var OrderSender
+     */
+    protected $orderSender;
+
     /**
      * CallbackService constructor.
      * @param CallbackMethod $callbackMethod
@@ -80,7 +96,19 @@ class CallbackService {
      * @param OrderFactory $orderFactory
      * @param OrderRepositoryInterface $orderRepository
      */
-    public function __construct(CallbackMethod $callbackMethod, CallbackEventAdapter $eventAdapter, OrderFactory $orderFactory, OrderRepositoryInterface $orderRepository, GatewayConfig $gatewayConfig, InvoiceService $invoiceService, InvoiceRepositoryInterface $invoiceRepository, StoreCardService $storeCardService, CustomerFactory $customerFactory, StoreManagerInterface $storeManager) {
+    public function __construct(
+        CallbackMethod $callbackMethod,
+        CallbackEventAdapter $eventAdapter,
+        OrderFactory $orderFactory,
+        OrderRepositoryInterface $orderRepository,
+        GatewayConfig $gatewayConfig,
+        InvoiceService $invoiceService,
+        InvoiceRepositoryInterface $invoiceRepository,
+        StoreCardService $storeCardService,
+        CustomerFactory $customerFactory,
+        StoreManagerInterface $storeManager,
+        OrderSender $orderSender
+    ) {
         $this->callbackMethod   = $callbackMethod;
         $this->eventAdapter     = $eventAdapter;
         $this->orderFactory     = $orderFactory;
@@ -91,6 +119,7 @@ public function __construct(CallbackMethod $callbackMethod, CallbackEventAdapter
         $this->storeCardService    = $storeCardService;
         $this->customerFactory = $customerFactory;
         $this->storeManager = $storeManager;
+        $this->orderSender          = $orderSender;
     }
 
     /**
@@ -100,74 +129,78 @@ public function __construct(CallbackMethod $callbackMethod, CallbackEventAdapter
      * @throws LocalizedException
      */
     public function run() {
-        if( ! $this->gatewayResponse) {
+        if(!$this->gatewayResponse) {
             throw new DomainException('The response is empty.');
         }
 
+        // Set the gateway response
         $this->callbackMethod->setGatewayResponse($this->gatewayResponse);
 
+        // Perform tasks and prepare data
         $commandName    = $this->getCommandName();
         $amount         = $this->getAmount();
-
-        $this->callbackMethod->validate();
-
         $order      = $this->getAssociatedOrder();
         $payment    = $order->getPayment();
 
-        if($payment instanceof Payment) {
+        // Get override comments setting from config
+        $overrideComments = $this->gatewayConfig->overrideOrderComments();
+
+        // Process the payment
+        if ($payment instanceof Payment) {
+            // Prepare payment info
             $infoInstance = $payment->getMethodInstance()->getInfoInstance();
             $this->callbackMethod->setInfoInstance($infoInstance);
-
             $this->putGatewayResponseToHolder();
 
-            // Perform the required action on transaction
-            switch($commandName) {
-                case 'capture':
-                    $this->callbackMethod->capture($payment, $amount);
-                    break;
-                case 'refund':
-                    $this->callbackMethod->refund($payment, $amount);
-                    break;
-                case 'void':
-                    $this->callbackMethod->void($payment);
-                    break;
+            // Test the command name
+            if ($commandName == 'refund') {
+                $this->callbackMethod->refund($payment, $amount);
+            }
+            else if ($commandName == 'void') {
+                $this->callbackMethod->void($payment);
             }
-
             // Perform authorize complementary actions
-            if ($commandName == 'authorize') {
+            else if ($commandName == 'authorize') {
                 // Update order status
-                $order->setState(\Magento\Sales\Model\Order::STATE_NEW);
-                $order->setStatus(\Magento\Sales\Model\Order::STATE_PENDING_PAYMENT);
+                $order->setStatus($this->gatewayConfig->getOrderStatusAuthorized());
 
-                // Delete comments history
-                foreach ($order->getAllStatusHistory() as $orderComment) {
-                    $orderComment->delete();
-                } 
+                // Send the email
+                $this->orderSender->send($order);
 
                 // Set email sent
                 $order->setEmailSent(1);
 
-                // Create new comment
-                $newComment = 'Authorized amount of ' . ChargeAmountAdapter::getStoreAmountOfCurrency($this->gatewayResponse['response']['message']['value'], $this->gatewayResponse['response']['message']['currency']) . ' ' . $this->gatewayResponse['response']['message']['currency'] .' Transaction ID: ' . $this->gatewayResponse['response']['message']['id'];
+                // Comments override
+                if ($overrideComments) {
+                    // Delete comments history
+                    foreach ($order->getAllStatusHistory() as $orderComment) {
+                        $orderComment->delete();
+                    } 
 
-                // Add the new comment
-                $order->addStatusToHistory($order->getStatus(), $newComment, $notify = true);
+                    // Create new comment
+                    $newComment = 'Authorized amount of ' . ChargeAmountAdapter::getStoreAmountOfCurrency($this->gatewayResponse['response']['message']['value'], $this->gatewayResponse['response']['message']['currency']) . ' ' . $this->gatewayResponse['response']['message']['currency'] .' Transaction ID: ' . $this->gatewayResponse['response']['message']['id'];
 
+                    // Add the new comment
+                    $order->addStatusToHistory($order->getStatus(), $newComment, $notify = true);
+                }
             }
 
             // Perform capture complementary actions
-            if ($commandName == 'capture') {
+            else if ($commandName == 'capture') {
                 // Update order status
-                $order->setState(\Magento\Sales\Model\Order::STATE_NEW);
-                $order->setStatus($this->gatewayConfig->getNewOrderStatus());
+                $order->setStatus($this->gatewayConfig->getOrderStatusCaptured());
 
-                // Create new comment
-                $newComment = 'Captured amount of ' . ChargeAmountAdapter::getStoreAmountOfCurrency($this->gatewayResponse['response']['message']['value'], $this->gatewayResponse['response']['message']['currency']) . ' ' . $this->gatewayResponse['response']['message']['currency'] .' Transaction ID: ' . $this->gatewayResponse['response']['message']['id'];
+                // Comments override
+                if ($overrideComments) {
+                    // Create new comment
+                    $newComment = 'Captured amount of ' . ChargeAmountAdapter::getStoreAmountOfCurrency($this->gatewayResponse['response']['message']['value'], $this->gatewayResponse['response']['message']['currency']) . ' ' . $this->gatewayResponse['response']['message']['currency'] .' Transaction ID: ' . $this->gatewayResponse['response']['message']['id'];
 
-                // Add the new comment
-                $order->addStatusToHistory($order->getStatus(), $newComment, $notify = true);
+                    // Add the new comment
+                    $order->addStatusToHistory($order->getStatus(), $newComment, $notify = true);
+                }
             }
 
+            // Save the order
             $this->orderRepository->save($order);
         }
     }
diff --git a/Model/Service/OrderService.php b/Model/Service/OrderService.php
index e5489a926..34da6a95c 100755
--- a/Model/Service/OrderService.php
+++ b/Model/Service/OrderService.php
@@ -21,7 +21,6 @@
 use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
 use CheckoutCom\Magento2\Observer\DataAssignObserver;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
 class OrderService {
 
@@ -50,11 +49,6 @@ class OrderService {
      */
     private $orderManager;
 
-    /**
-     * @var OrderSender
-     */
-    private $orderSender;
-
     /**
      * OrderService constructor.
      * @param CartManagementInterface $cartManagement
@@ -69,15 +63,13 @@ public function __construct(
         AgreementsValidatorInterface $agreementsValidator,
         Session $customerSession,
         Data $checkoutHelper,
-        Order $orderManager,
-        OrderSender $orderSender
+        Order $orderManager
     ) {
         $this->cartManagement       = $cartManagement;
         $this->agreementsValidator  = $agreementsValidator;
         $this->customerSession      = $customerSession;
         $this->checkoutHelper       = $checkoutHelper;
         $this->orderManager         = $orderManager;
-        $this->orderSender          = $orderSender;
     }
 
     /**
@@ -113,10 +105,6 @@ public function execute(Quote $quote, $cardToken, array $agreement) {
         // Place the order
         $orderId = $this->cartManagement->placeOrder($quote->getId());
 
-        // Send email
-        $order = $this->orderManager->load($orderId);
-        $this->orderSender->send($order);
-
         return $orderId;
     }
 
diff --git a/Model/Service/PaymentTokenService.php b/Model/Service/PaymentTokenService.php
index 91887124c..f0098474d 100755
--- a/Model/Service/PaymentTokenService.php
+++ b/Model/Service/PaymentTokenService.php
@@ -59,7 +59,13 @@ class PaymentTokenService {
      * @param StoreManagerInterface $storeManager
      * @param Watchdog $watchdog
     */
-    public function __construct(GatewayConfig $gatewayConfig, TransferFactory $transferFactory, Session $checkoutSession, StoreManagerInterface $storeManager, Watchdog $watchdog) {
+    public function __construct(
+        GatewayConfig $gatewayConfig,
+        TransferFactory $transferFactory,
+        Session $checkoutSession,
+        StoreManagerInterface $storeManager,
+        Watchdog $watchdog
+    ) {
         $this->gatewayConfig    = $gatewayConfig;
         $this->transferFactory  = $transferFactory;
         $this->checkoutSession = $checkoutSession;
@@ -76,19 +82,26 @@ public function __construct(GatewayConfig $gatewayConfig, TransferFactory $trans
      * @throws \Exception
      */
     public function getToken() {
+        // Get the quote object
+        $quote = $this->checkoutSession->getQuote();
+
+        // Get the reserved track id
+        $trackId = $quote->reserveOrderId()->save()->getReservedOrderId();
+
         // Get the quote currency
         $currencyCode = $this->storeManager->getStore()->getCurrentCurrencyCode();
 
         // Get the quote amount
-        $amount       =  ChargeAmountAdapter::getPaymentFinalCurrencyValue($this->checkoutSession->getQuote()->getGrandTotal());
+        $amount =  ChargeAmountAdapter::getPaymentFinalCurrencyValue($quote->getGrandTotal());
 
         // Prepare the amount 
-        $value        = ChargeAmountAdapter::getGatewayAmountOfCurrency($amount, $currencyCode);
+        $value = ChargeAmountAdapter::getGatewayAmountOfCurrency($amount, $currencyCode);
 
         // Prepare the transfer data
         $transfer = $this->transferFactory->create([
             'value'   => $value,
-            'currency'   => $currencyCode
+            'currency'   => $currencyCode,
+            'trackId' => $trackId
         ]);
 
         // Get the token
diff --git a/Model/Service/TokenChargeService.php b/Model/Service/TokenChargeService.php
new file mode 100755
index 000000000..b2732ba91
--- /dev/null
+++ b/Model/Service/TokenChargeService.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Model\Service;
+
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Payment\Gateway\Http\ClientException;
+use Magento\Payment\Model\Method\Logger;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use CheckoutCom\Magento2\Helper\Watchdog;
+use CheckoutCom\Magento2\Model\Adapter\ChargeAmountAdapter;
+use CheckoutCom\Magento2\Gateway\Http\TransferFactory;
+use CheckoutCom\Magento2\Gateway\Config\Config;
+
+class TokenChargeService {
+
+    const REDIRECT_URL = 'redirectUrl';
+
+    /**
+     * @var Logger
+     */
+    protected $logger;
+
+    /**
+     * @var GatewayConfig
+     */
+    protected $gatewayConfig;
+
+    /**
+     * @var TransferFactory
+     */
+    protected $transferFactory;
+
+    /**
+     * @var ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * @var Watchdog
+     */
+    protected $watchdog;
+
+    /**
+     * @var CheckoutSession
+     */
+    protected $checkoutSession;
+
+    public function __construct(
+        Config $gatewayConfig,
+        TransferFactory $transferFactory,
+        Logger $logger,
+        ManagerInterface $messageManager,
+        Watchdog $watchdog,
+        CheckoutSession $checkoutSession
+    ) {
+        $this->logger                   = $logger;
+        $this->gatewayConfig            = $gatewayConfig;
+        $this->transferFactory          = $transferFactory;
+        $this->messageManager           = $messageManager;
+        $this->watchdog                 = $watchdog;
+        $this->checkoutSession          = $checkoutSession;
+    }
+
+    public function sendChargeRequest($cardToken, $order) {
+        // Set the request parameters
+        $url = 'charges/token';
+        $method = 'POST';
+        $transfer = $this->transferFactory->create([
+            'autoCapTime'   => $this->gatewayConfig->getAutoCaptureTimeInHours(),
+            'autoCapture'   => $this->gatewayConfig->isAutoCapture() ? 'Y' : 'N',
+            'email'         => $order->getBillingAddress()->getEmail(),
+            'customerIp'    => $order->getRemoteIp(),
+            'chargeMode'    => $this->gatewayConfig->isVerify3DSecure() ? 2 : 1,
+            'attemptN3D'    => filter_var($this->gatewayConfig->isAttemptN3D(), FILTER_VALIDATE_BOOLEAN),
+            'customerName'  => $order->getCustomerName(),
+            'currency'      => ChargeAmountAdapter::getPaymentFinalCurrencyCode($order->getCurrencyCode()),
+            'value'         => $order->getGrandTotal()*100,
+            'trackId'       => $order->getIncrementId(),
+            'cardToken'     => $cardToken
+        ]);
+
+        // Handle the request
+        return $this->_handleRequest($url, $method, $transfer);
+    }
+
+    protected function _handleRequest($url, $method, $transfer) {
+        // Prepare log data
+        $log = [
+            'request'           => $transfer->getBody(),
+            'request_uri'       => $url,
+            'request_headers'   => $transfer->getHeaders(),
+            'request_method'    => $method,
+        ];
+
+        try {
+            // Send the request
+            $response           = $this->getHttpClient($url, $transfer)->request();
+            $result             = json_decode($response->getBody(), true);
+
+            // Handle the response
+            $result = $this->_handleResponse($result);
+
+            // Log the response
+            $log['response']    = $result;
+
+            return $result;
+        }
+        catch (Zend_Http_Client_Exception $e) {
+            throw new ClientException(__($e->getMessage()));
+        }
+        finally {
+            $this->logger->debug($log);
+        } 
+    }
+
+    protected function _handleResponse($response) {
+        // Debug info
+        $this->watchdog->bark($response);
+
+        // Handle response code
+        if (isset($response['responseCode']) && ((int) $response['responseCode'] == 10000 || (int) $response['responseCode'] == 10100)) {
+            // Prepare 3D Secure redirection with session variable for pre auth order
+            if (array_key_exists(self::REDIRECT_URL, $response)) {
+                
+                // Get the 3DS redirection URL
+                $redirectUrl = $response[self::REDIRECT_URL];
+                
+                // Set 3DS redirection in session for the PlaceOrder controller
+                $this->checkoutSession->set3DSRedirect($redirectUrl);
+
+                // Put the response in session for the PlaceOrder controller
+                $this->checkoutSession->setGatewayResponseId($response['id']);
+            }
+
+            return true;
+        }
+        else {
+            if (isset($response['responseMessage'])) {
+                $this->messageManager->addErrorMessage($response['responseMessage']);
+            }             
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns prepared HTTP client.
+     *
+     * @param string $endpoint
+     * @param TransferInterface $transfer
+     * @return ZendClient
+     * @throws \Exception
+     */
+    private function getHttpClient($endpoint, TransferInterface $transfer) {
+        $client = new ZendClient($this->gatewayConfig->getApiUrl() . $endpoint);
+        $client->setMethod('POST');
+        $client->setRawData( json_encode( $transfer->getBody()) ) ;
+        $client->setHeaders($transfer->getHeaders());
+        $client->setUrlEncodeBody($transfer->shouldEncode());
+        
+        return $client;
+    }
+}
diff --git a/Model/Service/TransactionService.php b/Model/Service/TransactionService.php
new file mode 100755
index 000000000..cc2cfe460
--- /dev/null
+++ b/Model/Service/TransactionService.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Model\Service;
+
+use Magento\Sales\Model\Order\Payment\Transaction;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
+use Magento\Framework\Message\ManagerInterface;
+use CheckoutCom\Magento2\Model\Ui\ConfigProvider;
+
+class TransactionService {
+
+    /**
+     * @var BuilderInterface
+     */
+    protected $transactionBuilder;
+
+    /**
+     * @var ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * TransactionService constructor.
+     * @param BuilderInterface $transactionBuilder
+     */
+    public function __construct(BuilderInterface $transactionBuilder, ManagerInterface $messageManager) {
+        $this->transactionBuilder = $transactionBuilder;
+        $this->messageManager     = $messageManager;
+    }
+
+    public function execute($order = null, $paymentData = array()) {
+        try {
+            // Prepare payment object
+            $payment = $order->getPayment();
+            $payment->setMethod(ConfigProvider::CODE); 
+            $payment->setLastTransId($paymentData['id']);
+            $payment->setTransactionId($paymentData['id']);
+            $payment->setAdditionalInformation([Transaction::RAW_DETAILS => (array) $paymentData]);
+
+            // Formatted price
+            $formatedPrice = $order->getBaseCurrency()->formatTxt($order->getGrandTotal());
+ 
+            // Prepare transaction
+            $transaction = $this->transactionBuilder->setPayment($payment)
+            ->setOrder($order)
+            ->setTransactionId($paymentData['id'])
+            ->setAdditionalInformation([Transaction::RAW_DETAILS => (array) $paymentData])
+            ->setFailSafe(true)
+            ->build(Transaction::TYPE_CAPTURE);
+ 
+            // Add transaction to payment
+            $payment->addTransactionCommentsToOrder($transaction, __('The authorized amount is %1.', $formatedPrice));
+            $payment->setParentTransactionId(null);
+
+            // Save payment, transaction and order
+            $payment->save();
+            $order->save();
+            $transaction->save();
+ 
+            return  $transaction->getTransactionId();
+
+        } catch (Exception $e) {
+            $this->messageManager->addExceptionMessage($e, $e->getMessage());
+        }
+    }
+}
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index fa99eb150..1ed5d84e9 100755
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -96,6 +96,8 @@ public function getConfig() {
                     'css_file' => $this->config->getCssFile(),
                     'custom_css' => $this->config->getCustomCss(),
                     'vault_title' => $this->config->getVaultTitle(),
+                    'order_creation' => $this->config->getOrderCreation(),
+                    'card_autosave' => $this->config->isCardAutosave(),
                 ],
             ],
         ];
diff --git a/Observer/AddExtraDataToTransport.php b/Observer/AddExtraDataToTransport.php
new file mode 100755
index 000000000..6dd613aec
--- /dev/null
+++ b/Observer/AddExtraDataToTransport.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class AddExtraDataToTransport implements ObserverInterface {
+
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    public function execute(Observer $observer)
+    {
+        // Get the email content
+        $transport = $observer->getEvent()->getTransport();
+
+        // Override the payment information block
+        $transport['payment_html'] = $this->scopeConfig->getValue('payment/checkout_com/title');
+    }
+}
diff --git a/Observer/OrderCancelObserver.php b/Observer/OrderCancelObserver.php
new file mode 100755
index 000000000..213462db7
--- /dev/null
+++ b/Observer/OrderCancelObserver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | integration@checkout.com
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+
+class OrderCancelObserver implements ObserverInterface {
+
+    /**
+     * @var OrderInterface
+     */
+    protected $orderInterface;
+
+    public function __construct(OrderInterface $order) {
+         $this->orderInterface = $orderInterface;    
+    }
+
+    /**
+     * Handles the observer for order cancellation.
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer) {
+   
+        $orderids = $observer->getEvent()->getOrderIds();     
+
+        echo "<pre>";
+        var_dump($orderids); 
+        echo "</pre>";
+
+        exit();
+    }
+
+}
diff --git a/Plugin/CustomerDashboardLinksManagement.php b/Plugin/CustomerDashboardLinksManagement.php
new file mode 100755
index 000000000..ba1611b00
--- /dev/null
+++ b/Plugin/CustomerDashboardLinksManagement.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace CheckoutCom\Magento2\Plugin;
+
+use Closure;
+use Magento\Framework\View\Element\Html\Links;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class CustomerDashboardLinksManagement
+ */
+class CustomerDashboardLinksManagement
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+
+    public function __construct (ScopeConfigInterface $scopeConfig) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    public function aroundRenderLink(Links $subject, Closure $proceed, AbstractBlock $link)
+    {
+        // Get the output   
+        $output = $proceed($link);
+
+        // If it's the dashboard menu
+        if ($subject->getNameInLayout() == 'customer_account_navigation') {
+            // If it's the stored payment cards lenu link
+            if ($link->getNameInLayout() == 'customer-account-navigation-my-credit-cards-link') {
+                if ((bool) $this->scopeConfig->getValue('payment/checkout_com_cc_vault/hide_card_storage')) {
+                    return '';
+                }
+            }
+        }
+
+        return $output;
+    }
+}
diff --git a/composer.json b/composer.json
index 56cbbdee7..21d71315e 100755
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "magento/module-vault": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "autoload": {
         "files": [
             "registration.php"
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index d4ca2c381..6ce9bb1c3 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -41,29 +41,13 @@
                         <config_path>payment/checkout_com/sort_order</config_path>
                     </field>
 
-                    <field id="new_order_status" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>New order status</label>
-                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
-                        <config_path>payment/checkout_com/new_order_status</config_path>
-                        <comment>Select the status that should be used for new orders.</comment>
-                    </field>
-
-                    <field id="auto_generate_invoice" translate="label comment" sortOrder="50" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Automatically generate invoice</label>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <config_path>payment/checkout_com/auto_generate_invoice</config_path>
-                        <comment>
-                            When set to "Yes", an invoice will be generated automatically for the new order status selected above.
-                        </comment>
-                    </field>
-
-                    <field id="integration" translate="label" sortOrder="60" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="integration" translate="label" sortOrder="40" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Integration</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\Integration</source_model>
                         <config_path>payment/checkout_com/integration</config_path>
                     </field>
 
-                    <field id="payment_mode" translate="label" sortOrder="70" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="payment_mode" translate="label" sortOrder="50" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Payment mode</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\PaymentMode</source_model>
                         <config_path>payment/checkout_com/payment_mode</config_path>
@@ -72,7 +56,7 @@
                         </depends>
                     </field>
 
-                    <field id="theme_color" translate="label comment" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="theme_color" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Theme color</label>
                         <config_path>payment/checkout_com/theme_color</config_path>
                         <comment>Provide a color code in hexadecimal format. Ex: #00b660.</comment>
@@ -81,7 +65,7 @@
                         </depends>
                     </field>     
 
-                 	<field id="button_label" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
+                 	<field id="button_label" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Button label</label>
                         <config_path>payment/checkout_com/button_label</config_path>
                         <depends>
@@ -89,7 +73,7 @@
                         </depends>
                     </field>
 
-                    <field id="embedded_theme" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="embedded_theme" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Theme</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\EmbeddedTheme</source_model>
                         <config_path>payment/checkout_com/embedded_theme</config_path>
@@ -98,7 +82,7 @@
                         </depends>
                     </field>
 
-                    <field id="css_file" translate="label" sortOrder="110" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="css_file" translate="label" sortOrder="90" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>CSS file</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\CssFile</source_model>
                         <config_path>payment/checkout_com/css_file</config_path>
@@ -107,7 +91,7 @@
                         </depends>
                     </field>
 
-                    <field id="custom_css" translate="label comment" type="file" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="custom_css" translate="label comment" type="file" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Custom Css File</label>
                         <backend_model>CheckoutCom\Magento2\Model\Config\Backend\CustomCss</backend_model>
                         <base_url type="media" scope_info="1">checkout_com</base_url>
@@ -144,19 +128,40 @@
                         </depends>
                     </field>
 
-                    <field id="useccv" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                   <field id="checkout_com_cc_vault_autosave" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Save cards automatically</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>payment/checkout_com_cc_vault/autosave</config_path>
+                        <depends>
+                            <field id="checkout_com_cc_vault_active">1</field>
+                        </depends>
+                        <comment>
+                            If set to "No", customers will be asked during checkout if the card used for payment should be stored. If set to "Yes", the card will be saved automatically without requesting agreement.
+                        </comment>
+                    </field>
+
+                    <field id="checkout_com_cc_vault_hide_storage" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Hide card storage</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>payment/checkout_com_cc_vault/hide_card_storage</config_path>
+                        <comment>
+                            If set to "Yes", customers will not be able to access the stored payment methods links from the account.
+                        </comment>
+                    </field>
+
+                    <field id="useccv" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>CVV Verification</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/checkout_com/useccv</config_path>
                     </field>
 
-                    <field id="verify_3dsecure" translate="label" sortOrder="40" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="verify_3dsecure" translate="label" sortOrder="60" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>3D Secure Verification</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/checkout_com/verify_3dsecure</config_path>
                     </field>
 
-                    <field id="attemptN3D" translate="label comment" sortOrder="50" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="attemptN3D" translate="label comment" sortOrder="70" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Attempt Non 3D Secure</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/checkout_com/attemptN3D</config_path>
@@ -168,13 +173,13 @@
                         </comment>
                     </field>
 
-                    <field id="auto_capture" translate="label" sortOrder="60" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="auto_capture" translate="label" sortOrder="80" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Auto Capture</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/checkout_com/auto_capture</config_path>
                     </field>
 
-                    <field id="auto_capture_time" translate="label comment" sortOrder="70" type="text" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="auto_capture_time" translate="label comment" sortOrder="90" type="text" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Auto Capture Time</label>
                         <config_path>payment/checkout_com/auto_capture_time</config_path>
                         <validate>validate-required validate-digits validate-zero-or-greater</validate>
@@ -187,15 +192,81 @@
                     </field>
                 </group>
 
-                <group id="checkout_com_currency_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="4">
+                <group id="checkout_com_order_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="4">
+                    <label>Order Settings</label>
+
+                    <field id="order_creation" translate="label" type="select" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Order creation</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderCreation</source_model>
+                        <config_path>payment/checkout_com/order_creation</config_path>
+                        <comment>
+                            Define if new orders should be created before or after payment authorization. Works with the Hosted integration only.
+                        </comment>
+                    </field>
+
+                    <field id="order_comments_override" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Override order comments</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>payment/checkout_com/order_comments_override</config_path>
+                        <comment>
+                            Set to "Yes" when using multiple currencies to avoid orders being flagged as fraud by Magento core.
+                        </comment>
+                    </field>
+
+                    <field id="new_order_status" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>New order status</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
+                        <config_path>payment/checkout_com/new_order_status</config_path>
+                        <comment>Select the status that should be used for new orders.</comment>
+                    </field>
+
+                    <field id="order_status_authorized" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Authorization order status</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
+                        <config_path>payment/checkout_com/order_status_authorized</config_path>
+                        <comment>Select the status that should be used for orders with successful payment authorisation.</comment>
+                    </field>
+
+                    <field id="order_status_captured" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Capture order status</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
+                        <config_path>payment/checkout_com/order_status_captured</config_path>
+                        <comment>Select the status that should be used for orders with successful payment capture.</comment>
+                    </field>
+
+                    <field id="order_status_refunded" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Refund order status</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
+                        <config_path>payment/checkout_com/order_status_refunded</config_path>
+                        <comment>Select the status that should be used for new orders with successful payment refund.</comment>
+                    </field>
+
+                    <field id="order_status_flagged" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Flagged order status</label>
+                        <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\OrderStatus</source_model>
+                        <config_path>payment/checkout_com/order_status_flagged</config_path>
+                        <comment>Select the status that should be used for flagged orders.</comment>
+                    </field>
+
+                    <field id="auto_generate_invoice" translate="label comment" sortOrder="70" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Automatically generate invoice</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>payment/checkout_com/auto_generate_invoice</config_path>
+                        <comment>
+                            When set to "Yes", an invoice will be generated automatically for the captured order status selected above.
+                        </comment>
+                    </field>
+                </group>
+
+                <group id="checkout_com_currency_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
                     <label>Currency Settings</label>
-                    <field id="payment_currency" translate="label" sortOrder="80" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="payment_currency" translate="label" sortOrder="0" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Payment Currency</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\PaymentCurrency</source_model>
                         <config_path>payment/checkout_com/payment_currency</config_path>
                     </field>
 
-                    <field id="custom_currency" translate="label comment" sortOrder="90" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="custom_currency" translate="label comment" sortOrder="10" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Custom Currency</label>
                         <source_model>CheckoutCom\Magento2\Model\Adminhtml\Source\CustomCurrency</source_model>
                         <config_path>payment/checkout_com/custom_currency</config_path>
@@ -205,7 +276,7 @@
                         <comment>If you select a single specific currency, please make sure the selected currency is available and activated in your merchant account. Contact your Checkout.com account manager or send an email to support@checkout.com for more information.</comment>
                     </field>
 
-                    <field id="accepted_currencies" translate="label comment" sortOrder="100" type="multiselect" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <field id="accepted_currencies" translate="label comment" sortOrder="20" type="multiselect" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                         <label>Accepted Currencies</label>
                         <source_model>Magento\Config\Model\Config\Source\Locale\Currency</source_model>
                         <config_path>payment/checkout_com/accepted_currencies</config_path>
@@ -213,35 +284,35 @@
                    </field>
                 </group>
 
-                <group id="checkout_com_country_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
+                <group id="checkout_com_country_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="6">
                     <label>Country Settings</label>
 
-                    <field id="allowspecific" translate="label" sortOrder="100" type="allowspecific" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="allowspecific" translate="label" sortOrder="0" type="allowspecific" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Payment from Applicable Countries</label>
                         <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                     </field>
 
-                    <field id="specificcountry" translate="label" sortOrder="110" type="multiselect" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="specificcountry" translate="label" sortOrder="10" type="multiselect" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Payment from Specific Countries</label>
                         <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     </field>
                 </group>
 
-                <group id="checkout_com_account_keys" translate="label" showInDefault="1" showInWebsite="1" sortOrder="6">
+                <group id="checkout_com_account_keys" translate="label" showInDefault="1" showInWebsite="1" sortOrder="7">
                     <label>Account keys</label>
-                    <field id="public_key" translate="label" sortOrder="10" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="public_key" translate="label" sortOrder="0" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Public Key</label>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <config_path>payment/checkout_com/public_key</config_path>
                     </field>
 
-                    <field id="secret_key" translate="label" sortOrder="20" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="secret_key" translate="label" sortOrder="10" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Secret Key</label>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <config_path>payment/checkout_com/secret_key</config_path>
                     </field>
 
-                    <field id="private_shared_key" translate="label" sortOrder="30" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="private_shared_key" translate="label" sortOrder="20" type="obscure" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Private Shared Key</label>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <config_path>payment/checkout_com/private_shared_key</config_path>
@@ -249,7 +320,7 @@
                     </field>
                 </group>
 
-                <group id="checkout_com_callback_urls" translate="label" showInDefault="1" showInWebsite="1" sortOrder="7">
+                <group id="checkout_com_callback_urls" translate="label" showInDefault="1" showInWebsite="1" sortOrder="8">
                     <label>Callbacks URLs</label>
 
                     <field id="webhook_url" translate="label" sortOrder="0" type="text" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -268,7 +339,7 @@
                     </field>
                 </group>
 
-                <group id="checkout_com_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="8">
+                <group id="checkout_com_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="9">
                     <label>Dynamic Descriptor</label>
 
                     <field id="descriptor_enable" translate="label comment" type="select" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/etc/config.xml b/etc/config.xml
index 828f518ff..8bea2c7b6 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -19,46 +19,44 @@
                 <can_authorize_vault>1</can_authorize_vault>
                 <can_capture_vault>1</can_capture_vault>
                 <can_charge_details>1</can_charge_details>
-                <order_status>processing</order_status>
-                <new_order_status>complete</new_order_status>
+                <order_creation>after_auth</order_creation>
+                <new_order_status>pending</new_order_status>
+                <order_status_authorized>pending_payment</order_status_authorized>
+                <order_status_captured>processing</order_status_captured>
+                <order_status_refunded>canceled</order_status_refunded>
+                <order_status_flagged>fraud</order_status_flagged>
+                <order_comments_override>1</order_comments_override>
                 <payment_currency>base_currency</payment_currency>
                 <custom_currency>USD</custom_currency>
                 <accepted_currencies>USD</accepted_currencies>
+                <verify_3dsecure>0</verify_3dsecure>
                 <attemptN3D>0</attemptN3D>
                 <auto_generate_invoice>1</auto_generate_invoice>
-
                 <theme_color>#00b660</theme_color>
                 <button_label>Pay Now</button_label>
                 <payment_mode>cards</payment_mode>
                 <embedded_theme>standard</embedded_theme>
                 <css_file>default</css_file>
                 <custom_css></custom_css>
-          
                 <environment>sandbox</environment>
                 <integration>hosted</integration>
                 <payment_action>authorize</payment_action>
                 <auto_capture>0</auto_capture>
                 <auto_capture_time>0</auto_capture_time>
-
                 <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_shared_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
- 
                 <sandbox_api_url><![CDATA[https://sandbox.checkout.com/api2/v2/]]></sandbox_api_url>
                 <live_api_url><![CDATA[https://api2.checkout.com/v2/]]></live_api_url>
-
                 <sandbox_embedded_url><![CDATA[https://cdn.checkout.com/v2/sandbox/js/checkout.js]]></sandbox_embedded_url>
                 <live_embedded_url><![CDATA[https://cdn.checkout.com/v2/js/checkout.js]]></live_embedded_url>
                 <embedded_css><![CDATA[https://cdn.checkout.com/v2/js/css/checkout.js.css]]></embedded_css>
-
                 <sandbox_hosted_url><![CDATA[https://secure1.checkout.com/sandbox/payment/]]></sandbox_hosted_url>
                 <live_hosted_url><![CDATA[https://secure1.checkout.com/payment/]]></live_hosted_url>
-
                 <sort_order>1</sort_order>
                 <debugReplaceKeys>public_key,secret_key</debugReplaceKeys>
                 <masked_fields>cvv,number</masked_fields>
                 <paymentInfoKeys>cc_type,cc_number,card_expiry_month,card_expiry_year,card_last_4,status,responseMessage,responseAdvancedInfo,responseCode,authCode,three_d_secure</paymentInfoKeys>
-
                 <useccv>1</useccv>
                 <save_card_check_amount>1.00</save_card_check_amount>
                 <save_card_check_currency>USD</save_card_check_currency>
@@ -66,6 +64,8 @@
             <checkout_com_cc_vault>
                 <model>CheckoutComCreditCardVaultFacade</model>
                 <title>Stored Cards (Checkout.com)</title>
+                <autosave>1</autosave>
+                <hide_card_storage>0</hide_card_storage>
             </checkout_com_cc_vault>
         </payment>
     </default>
diff --git a/etc/di.xml b/etc/di.xml
index 58dddade0..8255eb7ac 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-
     <!-- Payment Method Facade configuration -->
     <virtualType name="CheckoutComFacade" type="Magento\Payment\Model\Method\Adapter">
         <arguments>
@@ -434,6 +433,12 @@
     </type>
     <!-- END Around Payments Plugin -->
 
+    <!-- Accound dashboard plugin -->
+    <type name="Magento\Framework\View\Element\Html\Links">
+        <plugin sortOrder="1" name="CkoCustomerDashboardLinksManagement" type="CheckoutCom\Magento2\Plugin\CustomerDashboardLinksManagement"/>
+    </type>
+    <!-- END account dashboard plugin -->
+
     <!-- Plans grid listing -->
     <virtualType name="CheckoutCom\Magento2\Model\ResourceModel\Plan\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
         <arguments>
diff --git a/etc/events.xml b/etc/events.xml
index d214069fe..19a2da817 100755
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -3,4 +3,7 @@
     <event name="payment_method_assign_data_checkout_com">
         <observer name="checkout_com_gateway_data_assign" instance="CheckoutCom\Magento2\Observer\DataAssignObserver" />
     </event>
+    <event name="email_order_set_template_vars_before">
+        <observer name="add_extra_data_to_transport" instance="CheckoutCom\Magento2\Observer\AddExtraDataToTransport" />
+    </event>
 </config>
diff --git a/view/frontend/web/js/view/payment/method-renderer/cc-form.js b/view/frontend/web/js/view/payment/method-renderer/cc-form.js
index eaf7585fc..1d5b757cd 100755
--- a/view/frontend/web/js/view/payment/method-renderer/cc-form.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cc-form.js
@@ -19,9 +19,10 @@ define(
         'Magento_Checkout/js/model/quote',
         'Magento_Checkout/js/action/place-order',
         'CheckoutCom_Magento2/js/view/payment/response-strategy',
+        'Magento_Checkout/js/checkout-data',
         'Magento_Checkout/js/model/payment/additional-validators'
     ],
-    function ($, Component, VaultEnabler, CheckoutCom, quote, placeOrderAction, responseStrategy, additionalValidators) {
+    function ($, Component, VaultEnabler, CheckoutCom, quote, placeOrderAction, responseStrategy, checkoutData, additionalValidators) {
         'use strict';
 
         return Component.extend({
@@ -112,7 +113,7 @@ define(
              * @returns {string}
              */
             getEmailAddress: function() {
-                return window.checkoutConfig.customerData.email || quote.guestEmail;
+                return window.checkoutConfig.customerData.email || quote.guestEmail || checkoutData.getValidatedEmailValue();
             },
 
             /**
diff --git a/view/frontend/web/js/view/payment/method-renderer/embedded.js b/view/frontend/web/js/view/payment/method-renderer/embedded.js
index 73509bed0..8f94a8f5c 100755
--- a/view/frontend/web/js/view/payment/method-renderer/embedded.js
+++ b/view/frontend/web/js/view/payment/method-renderer/embedded.js
@@ -113,6 +113,13 @@ define(
                 return CheckoutCom.getPaymentConfig()['quote_currency'];
             },
 
+            /**
+             * @returns {bool}
+             */
+            isCardAutosave: function() {
+                return CheckoutCom.getPaymentConfig()['card_autosave'];
+            },
+            
             /**
              * @returns {string}
              */
@@ -124,10 +131,13 @@ define(
              * @returns {void}
              */
             saveSessionData: function() {
+                // Get self
+                var self = this;
+
                 // Prepare the session data
                 var sessionData = {
                     saveShopperCard: $('#checkout_com_enable_vault').is(":checked"),
-                    customerEmail: checkoutData.getValidatedEmailValue()
+                    customerEmail: self.getEmailAddress()
                 };
 
                 // Send the session data to be saved
@@ -210,14 +220,13 @@ define(
                     theme: ckoTheme,
                     themeOverride: ckoThemeOverride,
                     cardTokenised: function(event) {
-
                         // Set the card token
                         self.setCardTokenId(event.data.cardToken);
 
+                        // Place order
                         if (threeds_enabled) {
                             window.location.replace(redirectUrl + '?cko-card-token=' + event.data.cardToken + '&cko-context-id=' + self.getEmailAddress());
                         } else {
-                            // Place order
                             self.placeOrder();
                         }
                     },
diff --git a/view/frontend/web/js/view/payment/method-renderer/hosted.js b/view/frontend/web/js/view/payment/method-renderer/hosted.js
index 626c51aaa..b88037cf7 100755
--- a/view/frontend/web/js/view/payment/method-renderer/hosted.js
+++ b/view/frontend/web/js/view/payment/method-renderer/hosted.js
@@ -19,9 +19,10 @@ define(
         'Magento_Checkout/js/model/quote',
         'mage/url',
         'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/model/full-screen-loader',
         'Magento_Checkout/js/model/payment/additional-validators'
     ],
-    function ($, Component, VaultEnabler, CheckoutCom, quote, url, checkoutData, additionalValidators) {
+    function ($, Component, VaultEnabler, CheckoutCom, quote, url, checkoutData, fullScreenLoader, additionalValidators) {
         'use strict';
 
         window.checkoutConfig.reloadOnBillingAddress = true;
@@ -56,7 +57,7 @@ define(
             /**
              * @returns {string}
              */
-            getPaymentToken: function() {
+            getPaymentToken: function() {                
                 return CheckoutCom.getPaymentConfig()['payment_token'];
             },
 
@@ -64,7 +65,6 @@ define(
              * @returns {string}
              */
             getQuoteValue: function() {
-               //return CheckoutCom.getPaymentConfig()['quote_value'];
                return (quote.getTotals()().grand_total*100).toFixed(2);
             },
 
@@ -75,6 +75,13 @@ define(
                 return CheckoutCom.getPaymentConfig()['quote_currency'];
             },
 
+            /**
+             * @returns {bool}
+             */
+            isCardAutosave: function() {
+                return CheckoutCom.getPaymentConfig()['card_autosave'];
+            },
+
             /**
              * @returns {string}
              */
@@ -99,23 +106,25 @@ define(
             /**
              * @returns {void}
              */
-            saveSessionData: function() {                
-                // Prepare the session data
-                var sessionData = {
-                    saveShopperCard: $('#checkout_com_enable_vault').is(":checked"),
-                    customerEmail: checkoutData.getValidatedEmailValue()
-                };
-
+            saveSessionData: function(dataToSave) {                
                 // Send the session data to be saved
                 $.ajax({
                     url : url.build('checkout_com/shopper/sessionData'),
                     type: "POST",
-                    data : sessionData,
+                    data : dataToSave,
                     success: function(data, textStatus, xhr) { },
                     error: function (xhr, textStatus, error) { } // todo - improve error handling
                 });
             },
 
+            /**
+             * @returns {string}
+             */
+            proceedWithSubmission: function() {
+                // Submit the form
+                $('#checkout_com-hosted-form').submit();
+            },
+
             /**
              * @returns {string}
              */
@@ -125,11 +134,68 @@ define(
 
                 // Validate before submission
                 if (additionalValidators.validate()) {
-                    // Set the save card option in session
-                    self.saveSessionData();
-
-                    // Submit the form
-                    $('#checkout_com-hosted-form').submit();
+                    // Payment action
+                    if (CheckoutCom.getPaymentConfig()['order_creation'] == 'before_auth') {
+
+                        // Start the loader
+                        fullScreenLoader.startLoader();
+
+                        // Prepare the vars
+                        var ajaxRequest;
+                        var orderData = {
+                            "cko-card-token": null, 
+                            "cko-context-id": self.getEmailAddress(),
+                            "agreement": [true]
+                        };
+                        
+                        // Avoid duplicate requests
+                        if (ajaxRequest) {
+                            ajaxRequest.abort();
+                        }
+
+                        // Send the request
+                        ajaxRequest = $.ajax({
+                            url: url.build('checkout_com/payment/placeOrderAjax'),
+                            type: "post",
+                            data: orderData
+                        });
+
+                        // Callback handler on success
+                        ajaxRequest.done(function (response, textStatus, jqXHR){
+
+                            // Save order track id response object in session
+                            self.saveSessionData({
+                                saveShopperCard: $('#checkout_com_enable_vault').is(":checked"),
+                                customerEmail: self.getEmailAddress(),
+                                orderTrackId: response.trackId
+                            });
+
+                            // Proceed with submission
+                            fullScreenLoader.stopLoader();
+                            self.proceedWithSubmission();
+                        });
+
+                        // Callback handler on failure
+                        ajaxRequest.fail(function (jqXHR, textStatus, errorThrown){
+                            // Todo - improve error handling
+                        });
+
+                        // Callback handler always
+                        ajaxRequest.always(function () {
+                            // Stop the loader
+                            fullScreenLoader.stopLoader();
+                        });
+                    }
+                    else if (CheckoutCom.getPaymentConfig()['order_creation'] == 'after_auth') {
+                        // Save the session data
+                        self.saveSessionData({
+                            saveShopperCard: $('#checkout_com_enable_vault').is(":checked"),
+                            customerEmail: self.getEmailAddress()
+                        });
+
+                        // Proceed with submission
+                        self.proceedWithSubmission();
+                    }
                 }
             }
         });
diff --git a/view/frontend/web/template/payment/embedded.html b/view/frontend/web/template/payment/embedded.html
index cd1eae1b6..2d4e8b205 100644
--- a/view/frontend/web/template/payment/embedded.html
+++ b/view/frontend/web/template/payment/embedded.html
@@ -42,7 +42,7 @@
             <!--/ko-->
         </div>
 
-        <!-- ko if: (isVaultEnabled())-->
+        <!-- ko if: ((isVaultEnabled()) && !isCardAutosave()) -->
         <div class="field choice">
             <input type="checkbox" name="vault[is_enabled]" class="checkbox" data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler" />
             <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
diff --git a/view/frontend/web/template/payment/hosted.html b/view/frontend/web/template/payment/hosted.html
index 07abc51f7..70689dd88 100755
--- a/view/frontend/web/template/payment/hosted.html
+++ b/view/frontend/web/template/payment/hosted.html
@@ -53,7 +53,7 @@
             <!--/ko-->
         </div>
 
-        <!-- ko if: (isVaultEnabled())-->
+        <!-- ko if: ((isVaultEnabled()) && !isCardAutosave()) -->
         <div class="field choice">
             <input type="checkbox" name="vault[is_enabled]" class="checkbox" data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler" />
             <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">