diff --git a/Block/Webpayment.php b/Block/Webpayment.php
new file mode 100644
index 0000000..e53aba2
--- /dev/null
+++ b/Block/Webpayment.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace Sapient\Worldpay\Block;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template;
+use Magento\Checkout\Block\Cart\AbstractCart;
+use Sapient\Worldpay\Helper\Data;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Message\ManagerInterface;
+
+/**
+ * Webpayment block
+ */
+class Webpayment extends Template
+{
+
+    /**
+   * @var \Magento\Framework\App\Config\ScopeConfigInterface
+   */
+   protected $scopeConfig;
+   
+    /**
+    * @var \Magento\Customer\Model\Session
+    */
+    protected $customerSession;
+    
+    /**
+    * @var \Magento\Checkout\Block\Cart\AbstractCart
+    */
+    protected $cart;
+    
+    /**
+    * @var Sapient\Worldpay\Helper\Data;
+    */
+    
+    protected $helper;
+    
+    
+    /**
+    * @var Magento\Framework\Message\ManagerInterface
+    */
+    
+    protected $messageManager;
+
+    /**
+     * Webpayment constructor.
+     * @param Template\Context $context
+     * @param AbstractCart $cart
+     * @param Create $helper
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        AbstractCart $cart,
+        Data $helper,
+        array $data = [],
+        Session $customerSession,
+        \Magento\Integration\Model\Oauth\TokenFactory $tokenModelFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Message\ManagerInterface $messageManager)
+    {
+
+        $this->_helper = $helper;
+        $this->_cart = $cart;
+        parent::__construct(
+            $context,
+            $data
+        );
+        $this->_customerSession = $customerSession;
+        $this->_tokenModelFactory = $tokenModelFactory;
+        $this->scopeConfig = $scopeConfig;
+        $this->_messageManager = $messageManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrency(){
+        $currency = $this->_cart->getQuote()->getQuoteCurrencyCode();
+        return $currency;
+    }
+
+    public function getAllItems(){
+        $allItems = $this->_cart->getQuote()->getAllVisibleItems();
+        return $allItems;
+    }
+
+    public function getTotal(){
+        $quote = $this->_cart->getTotalsCache();
+        $getGrandTotal = $quote['grand_total']->getData('value');
+
+        return $getGrandTotal;
+    }
+
+    public function getShippingRate(){
+        $quote = $this->_cart->getTotalsCache();
+        $getShippingRate = $quote['shipping']->getData('value');
+
+        return $getShippingRate;
+    }
+    
+    public function getTaxRate(){
+        $quote = $this->_cart->getTotalsCache();
+        $getShippingRate = $quote['tax']->getData('value');
+
+        return $getShippingRate;
+    }
+
+    public function getSubTotal(){
+        $quote = $this->_cart->getTotalsCache();
+        $getSubTotal = $quote['subtotal']->getData('value');
+
+        return $getSubTotal;
+    }
+
+    
+    public function getCustomerToken()
+    {
+        $customerId = $this->_customerSession->getCustomer()->getId();
+        $customerToken = $this->_tokenModelFactory->create();
+         return $customerToken->createCustomerToken($customerId)->getToken();
+          
+    }
+    
+    public function getshippingRequired()
+    {
+        // Disable shipping for downloadable and virtual products
+        $shippingReq = 'true';
+        $allItems = $this->_cart->getQuote()->getAllItems();
+        if($allItems) {
+        $productType = array();
+        if($allItems) {
+        foreach($allItems as $item) {
+            $productType[] = $item->getProductType();
+         }
+
+        $count = count($allItems); 
+       
+       
+        // remove duplicates in array
+        $productType = array_unique($productType);
+        // remove downloadable product types in array
+        $productType = array_diff( $productType, ['downloadable'] );
+        
+         // remove virtual product types in array
+        $productType = array_diff( $productType, ['virtual'] );
+
+        // Now check if any other product types are still there in array, if no disable shipping
+        if( sizeof($productType) == 0 ) {
+             $shippingReq = 'false';  
+        }
+        }
+       
+        return $shippingReq;
+      
+        }
+          
+    }
+    
+    public function checkDownloadableProduct()
+    {
+        // Login required for downloadable and virtual products
+        $allItems = $this->_cart->getQuote()->getAllItems();
+        $productType = array();
+        if($allItems) {
+        foreach($allItems as $item) {
+            $productType[] = $item->getProductType();
+         }
+ 
+        $productType = array_unique($productType);     
+       
+        $isDownloadable = 'false';
+        
+        if (in_array("downloadable", $productType)) {
+        $isDownloadable = 'true';
+        }
+        if (in_array("virtual", $productType)) {
+        $isDownloadable = 'true';
+        }  
+               
+        return $isDownloadable;
+        }
+        return 'false';
+          
+    }
+
+    
+    public function getProductCount()
+    {
+         $allItems = $this->_cart->getQuote()->getAllVisibleItems();
+         return $count = count($allItems);
+    }
+    
+     public function getChromepayButtonName() {
+     $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+
+     return $this->scopeConfig->getValue('worldpay/cc_config/chromepay_button_name', $storeScope);
+     }
+     
+     public function getChromepayEnabled() {
+     $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+
+     return $this->scopeConfig->getValue('worldpay/cc_config/chromepay', $storeScope);
+     }
+     
+     public function getPaymentMode() {
+     $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+
+     return $this->scopeConfig->getValue('worldpay/cc_config/integration_mode', $storeScope);
+     }
+    
+}
\ No newline at end of file
diff --git a/Controller/Cartdetails/Chromepay.php b/Controller/Cartdetails/Chromepay.php
new file mode 100644
index 0000000..b5ae2f9
--- /dev/null
+++ b/Controller/Cartdetails/Chromepay.php
@@ -0,0 +1,56 @@
+<?php
+namespace Sapient\Worldpay\Controller\Cartdetails;
+
+class Chromepay extends \Magento\Framework\App\Action\Action
+{
+	protected $_pageFactory;
+	protected $_request;
+	protected $_paymentservicerequest;
+	protected $_authSession;
+
+	public function __construct(
+		\Magento\Framework\App\Action\Context $context,
+		\Magento\Framework\View\Result\PageFactory $pageFactory,
+                \Magento\Framework\App\Request\Http $request,
+                \Sapient\Worldpay\Model\Request\PaymentServiceRequest $paymentservicerequest,
+                \Magento\Backend\Model\Auth\Session $authSession,
+                \Sapient\Worldpay\Helper\Data $worldpayHelper)
+	{
+		$this->_pageFactory = $pageFactory;
+		$this->_request = $request;
+		$this->_paymentservicerequest = $paymentservicerequest;
+		$this->_authSession = $authSession;
+                $this->worldpayHelper = $worldpayHelper;
+		return parent::__construct($context);
+	}
+
+	public function execute()
+	{
+            $data = $this->getRequest()->getParams();
+            $orderCode = $this->_authSession->getOrderCode();
+            $currencyCode = $this->_authSession->getCurrencyCode();
+            if($data && $orderCode){
+                $reqData = json_decode($data['data']);
+                $paymentDetails = $reqData->details;
+                $shippingAddress = $reqData->shippingAddress;
+                $billingAddress = $paymentDetails->billingAddress;
+                $chromeOrderParams = array();
+                $chromeOrderParams['orderCode'] = $orderCode;
+                $chromeOrderParams['merchantCode'] = $this->worldpayHelper->getMerchantCode();
+                $chromeOrderParams['orderDescription'] = $this->worldpayHelper->getOrderDescription();
+                $chromeOrderParams['currencyCode'] = $currencyCode;
+                $chromeOrderParams['amount'] = $data['totalAmount'];
+                $chromeOrderParams['paymentType'] = $data['cardType'];
+                $chromeOrderParams['paymentDetails'] = $paymentDetails;
+                $chromeOrderParams['shopperEmail'] = $reqData->payerEmail;
+                $chromeOrderParams['shippingAddress'] = $shippingAddress;
+                $chromeOrderParams['billingAddress'] = $billingAddress;
+                if($chromeOrderParams){
+                    $response = $this->_paymentservicerequest->chromepayOrder($chromeOrderParams);
+                }
+            } else{
+                $response = false;
+            }
+            return $response;
+	}
+}
\ No newline at end of file
diff --git a/Controller/Savedcard/Edit.php b/Controller/Savedcard/Edit.php
index 02a87ce..4f8c4a7 100644
--- a/Controller/Savedcard/Edit.php
+++ b/Controller/Savedcard/Edit.php
@@ -50,7 +50,19 @@ public function execute()
             return;
         }
         $resultPage = $this->_resultPageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('Update Saved Card'));
-        return $resultPage;
+        $id = $this->getRequest()->getParam('id');
+        $customerId = $this->customerSession->getCustomer()->getId();
+        if($id){      
+            $cardDetails = $this->savecard->create()->load($id);
+            if($cardDetails->getCustomerId() != $customerId){               
+                $this->_redirect('404notfound');
+                return;
+            }
+            $resultPage->getConfig()->getTitle()->set(__('Update Saved Card'));
+            return $resultPage;
+        } else{
+            $this->_redirect('404notfound');
+            return;
+        }   
     }
 }
diff --git a/Controller/Wallets/Success.php b/Controller/Wallets/Success.php
new file mode 100644
index 0000000..5d767c8
--- /dev/null
+++ b/Controller/Wallets/Success.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Controller\Wallets;
+
+use Magento\Framework\App\Action\Context;
+use Exception;
+
+class Success extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     */
+    public function __construct(Context $context,
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+    ) {
+        $this->wplogger = $wplogger;
+        $this->_resultPageFactory = $resultPageFactory;
+        parent::__construct($context);
+    }
+
+    /**
+     * Renders the 3D Secure  page, responsible for forwarding
+     * all necessary order data to worldpay.
+     */
+    public function execute()
+    {
+        return $this->resultRedirectFactory->create()->setPath('checkout/onepage/success', ['_current' => true]);
+    }
+}
diff --git a/Cron/OrderSyncStatus.php b/Cron/OrderSyncStatus.php
new file mode 100644
index 0000000..ea37c69
--- /dev/null
+++ b/Cron/OrderSyncStatus.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Cron;
+use \Magento\Framework\App\ObjectManager;
+use \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Exception;
+
+/**
+ * Model for order sync status based on configuration set by admin
+ */
+class OrderSyncStatus {
+
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $_logger;
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     */
+    private $orderCollectionFactory;
+    private $_orderId;
+    private $_order;
+    private $_paymentUpdate;
+    private $_tokenState;
+    
+    /**
+     * Constructor
+     *
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param JsonFactory $resultJsonFactory
+     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+     * @param \Sapient\Worldpay\Helper\Data $worldpayhelper
+     * @param \Sapient\Worldpay\Model\Payment\Service $paymentservice,
+     * @param \Sapient\Worldpay\Model\Token\WorldpayToken $worldpaytoken,
+     * @param \Sapient\Worldpay\Model\Order\Service $orderservice
+     */
+    public function __construct(JsonFactory $resultJsonFactory,
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
+        \Sapient\Worldpay\Helper\Data $worldpayhelper,
+        \Sapient\Worldpay\Model\Payment\Service $paymentservice,
+        \Sapient\Worldpay\Model\Token\WorldpayToken $worldpaytoken,
+        \Sapient\Worldpay\Model\Order\Service $orderservice
+    ) {
+        $this->_logger = $wplogger;
+        $this->_orderCollectionFactory = $orderCollectionFactory;
+        $this->worldpayhelper = $worldpayhelper;
+        $this->paymentservice = $paymentservice;
+        $this->orderservice = $orderservice;
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->worldpaytoken = $worldpaytoken;
+
+    }
+
+    /**
+     * Get the list of orders to be sync the status
+     */
+    public function execute()
+    {
+        $this->_logger->info('Orders sync status executed on - '.date('Y-m-d H:i:s'));
+        $orderIds = $this->getOrderIds();
+        
+        if (!empty($orderIds)) {
+            foreach ($orderIds as $order) {
+                $this->_loadOrder($order);
+                $this->createSyncRequest();
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get the list of orders to be Sync
+     *
+     * @return array List of order IDs
+     */
+    public function getOrderIds()
+    {
+        // Complete order status for downloadable products
+        $orderStatus = array('pending','processing','complete');
+        $orders = $this->getOrderCollectionFactory()->create();
+        $orders->distinct(true);
+        $orders->addFieldToSelect(array('entity_id','increment_id','created_at'));
+        $orders->addFieldToFilter('main_table.status', array('in' => $orderStatus));
+        $orderIds = array_reduce($orders->getItems(), array($this, '_filterOrder'));
+        return $orderIds;
+    }
+
+    /**
+     * @return CollectionFactoryInterface
+     */
+    private function getOrderCollectionFactory()
+    {
+        if ($this->orderCollectionFactory === null) {
+
+            $this->orderCollectionFactory = ObjectManager::getInstance()->get(CollectionFactoryInterface::class);
+        }
+        return $this->orderCollectionFactory;
+    }
+
+    /**
+     * Returns orders have creation date exceeded the allowed limit
+     *
+     * @param array $carry Result of previous filter call
+     * @param \Magento\Sales\Model\Order
+     *
+     * @return array List of order IDs
+     */       
+    protected function _filterOrder($carry, \Magento\Sales\Model\Order $order)
+    {
+        if ($this->getCreationDate($order) > $this->getLimitDateForMethod()) {
+            $carry[] = $order->getEntityId();
+        }
+        return $carry;
+    }
+
+    /**
+     * Computes the latest valid date
+     *
+     * @return DateTime
+     */
+    protected function getLimitDateForMethod()
+    {
+        $timelimit = 24;
+        $date = new \DateTime('now');
+        $interval = new  \DateInterval(sprintf('PT%dH', $timelimit));
+        $date->sub($interval);
+        return $date;
+    }
+
+    /**
+     * @param \Magento\Sales\Model\Order $order
+     *
+     * @return float|mixed
+     */
+    protected function getCreationDate(\Magento\Sales\Model\Order $order)
+    {
+        return \DateTime::createFromFormat('Y-m-d H:i:s', $order->getData('created_at'));
+    }
+
+    /**
+     * Computes the latest valid date
+     *@return DateTime
+     */
+    protected function getLimitDate()
+    {
+        $cleanUpInterval = $this->worldpayhelper->orderCleanUpInterval();
+        $date = new \DateTime('now');
+        $interval = new  \DateInterval(sprintf('PT%dH', $cleanUpInterval));
+        $date->sub($interval);
+        return $date;
+    }
+    
+    private function _loadOrder($orderId)
+    {
+        $this->_orderId = $orderId;
+        $this->_order = $this->orderservice->getById($this->_orderId);
+    }
+    
+    /**
+     * Computes the latest valid date
+     *@return DateTime
+     */
+    
+    public function createSyncRequest(){
+        try {
+            $this->_fetchPaymentUpdate();
+            $this->_registerWorldPayModel();
+            $this->_applyPaymentUpdate();
+            $this->_applyTokenUpdate();
+        } catch (Exception $e) {
+            $this->_logger->error($e->getMessage());
+             if ($e->getMessage() == 'same state') {
+                $this->_logger->error('Payment synchronized successfully!!');
+             } else {
+                 $this->_logger->error('Synchronising Payment Status failed: ' . $e->getMessage());
+             }
+        }
+        return true;
+    }
+    
+    private function _fetchPaymentUpdate()
+    {
+        $xml = $this->paymentservice->getPaymentUpdateXmlForOrder($this->_order);
+        $this->_paymentUpdate = $this->paymentservice->createPaymentUpdateFromWorldPayXml($xml);
+        $this->_tokenState = new \Sapient\Worldpay\Model\Token\StateXml($xml);
+    }
+
+    private function _registerWorldPayModel()
+    {
+        $this->paymentservice->setGlobalPaymentByPaymentUpdate($this->_paymentUpdate);
+    }
+
+    private function _applyPaymentUpdate()
+    {
+        try {
+            $this->_paymentUpdate->apply($this->_order->getPayment(),$this->_order);
+        } catch (Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+    }
+
+    private function _applyTokenUpdate()
+    {
+        $this->worldpaytoken->updateOrInsertToken($this->_tokenState, $this->_order->getPayment());
+    }
+
+
+}
\ No newline at end of file
diff --git a/Helper/Data.php b/Helper/Data.php
index d03f3ef..3b68c22 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -150,6 +150,20 @@ public function getApmTypes($code)
 		}
 		return $activeMethods;
 	}
+        public function getWalletsTypes($code)
+	{
+            $activeMethods =  array();
+            if($this->isGooglePayEnable()){
+                $activeMethods['PAYWITHGOOGLE-SSL'] = 'Google Pay';
+            }
+            if($this->isSamsungPayEnable()){
+                $activeMethods['SAMSUNGPAY-SSL'] = 'Samsung Pay';
+            }
+            if($this->isApplePayEnable()){
+                $activeMethods['APPLEPAY-SSL'] = 'Apple Pay';
+            }
+            return $activeMethods;
+	}
 	public function getCsePublicKey(){
 		return trim($this->_scopeConfig->getValue('worldpay/cc_config/cse_public_key', \Magento\Store\Model\ScopeInterface::SCOPE_STORE));
 	}
@@ -330,6 +344,8 @@ public function getPaymentTitleForOrders($order, $paymentCode, \Sapient\Worldpay
 			return $this->getCcTitle()."\n".$item->getPaymentType();
 		} else if($paymentCode == 'worldpay_apm') {
 			return $this->getApmTitle()."\n".$item->getPaymentType();
+                }else if($paymentCode == 'worldpay_wallets') {
+			return $this->getWalletsTitle()."\n".$item->getPaymentType();
 		}else if($paymentCode == 'worldpay_moto') {
 			return $this->getMotoTitle()."\n".$item->getPaymentType();
 		}
@@ -338,7 +354,56 @@ public function getPaymentTitleForOrders($order, $paymentCode, \Sapient\Worldpay
 	public function getOrderByOrderId($orderId){
         return $this->orderFactory->create()->load($orderId);
     }
+    
+    public function getWalletsTitle()
+    {
+        return  $this->_scopeConfig->getValue('worldpay/wallets_config/title', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function isGooglePayEnable()
+    {
+        return (bool) $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function googlePaymentMethods()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/paymentmethods', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
 
+    public function googleAuthMethods()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/authmethods', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function googleGatewayMerchantname()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/gateway_merchantname', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function googleGatewayMerchantid()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/gateway_merchantid', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function googleMerchantname()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/merchant_name', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function googleMerchantid()
+    {
+        return $this->_scopeConfig->getValue('worldpay/wallets_config/google_pay_wallets_config/merchant_id', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function isApplePayEnable()
+    {
+        return (bool) $this->_scopeConfig->getValue('worldpay/wallets_config/apple_pay_wallets_config/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+    
+    public function isSamsungPayEnable()
+    {
+        return (bool) $this->_scopeConfig->getValue('worldpay/wallets_config/samsung_pay_wallets_config/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
 }
 
 
diff --git a/Model/Authorisation/WalletService.php b/Model/Authorisation/WalletService.php
new file mode 100644
index 0000000..97e3636
--- /dev/null
+++ b/Model/Authorisation/WalletService.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Authorisation;
+use Exception;
+
+class WalletService extends \Magento\Framework\DataObject
+{
+
+    protected $checkoutSession;
+    protected $updateWorldPayPayment;
+
+    public function __construct(
+        \Sapient\Worldpay\Model\Mapping\Service $mappingservice,
+        \Sapient\Worldpay\Model\Request\PaymentServiceRequest $paymentservicerequest,
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Sapient\Worldpay\Model\Response\DirectResponse $directResponse,
+        \Sapient\Worldpay\Model\Payment\UpdateWorldpaymentFactory $updateWorldPayPayment,
+        \Sapient\Worldpay\Model\Payment\Service $paymentservice,
+        \Sapient\Worldpay\Helper\Registry $registryhelper,
+        \Magento\Framework\UrlInterface $urlBuilder,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Sapient\Worldpay\Helper\Data $worldpayHelper
+    ) {
+        $this->mappingservice = $mappingservice;
+        $this->paymentservicerequest = $paymentservicerequest;
+        $this->wplogger = $wplogger;
+        $this->directResponse = $directResponse;
+        $this->paymentservice = $paymentservice;
+        $this->checkoutSession = $checkoutSession;
+        $this->updateWorldPayPayment = $updateWorldPayPayment;
+        $this->worldpayHelper = $worldpayHelper;
+        $this->registryhelper = $registryhelper;
+        $this->urlBuilders    = $urlBuilder;
+    }
+
+    /**
+     * handles provides authorization data for redirect
+     * It initiates a  XML request to WorldPay and registers worldpayRedirectUrl
+     */
+    public function authorizePayment(
+        $mageOrder,
+        $quote,
+        $orderCode,
+        $orderStoreId,
+        $paymentDetails,
+        $payment
+    ) {
+        $this->checkoutSession->setauthenticatedOrderId($mageOrder->getIncrementId());
+        if($paymentDetails['additional_data']['cc_type'] == 'PAYWITHGOOGLE-SSL'){
+            $walletOrderParams = $this->mappingservice->collectWalletOrderParameters(
+                $orderCode,
+                $quote,
+                $orderStoreId,
+                $paymentDetails
+            );
+
+            $response = $this->paymentservicerequest->walletsOrder($walletOrderParams);
+            $directResponse = $this->directResponse->setResponse($response);
+            $this->updateWorldPayPayment->create()->updateWorldpayPayment($directResponse, $payment);
+            $this->_applyPaymentUpdate($directResponse, $payment);
+        }
+    }
+
+    private function _applyPaymentUpdate(
+        \Sapient\Worldpay\Model\Response\DirectResponse $directResponse,
+        $payment
+    ) {
+        $paymentUpdate = $this->paymentservice->createPaymentUpdateFromWorldPayXml($directResponse->getXml());
+        $paymentUpdate->apply($payment);
+        $this->_abortIfPaymentError($paymentUpdate);
+    }
+
+    private function _abortIfPaymentError($paymentUpdate)
+    {
+        if ($paymentUpdate instanceof \Sapient\WorldPay\Model\Payment\Update\Refused) {
+             throw new Exception(sprintf('Payment REFUSED'));
+         }
+
+        if ($paymentUpdate instanceof \Sapient\WorldPay\Model\Payment\Update\Cancelled) {
+            throw new Exception(sprintf('Payment CANCELLED'));
+        }
+
+        if ($paymentUpdate instanceof \Sapient\WorldPay\Model\Payment\Update\Error) {
+            throw new Exception(sprintf('Payment ERROR'));
+        }
+    }
+}
diff --git a/Model/Config/Source/AuthMethods.php b/Model/Config/Source/AuthMethods.php
new file mode 100644
index 0000000..7307649
--- /dev/null
+++ b/Model/Config/Source/AuthMethods.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Config\Source;
+
+class AuthMethods extends \Magento\Framework\App\Config\Value
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+
+        return [
+            ['value' => 'PAN_ONLY', 'label' => __('Pan Only')],
+            ['value' => 'CRYPTOGRAM_3DS', 'label' => __('Cryptogram 3ds')]
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/Model/Config/Source/PaymentMethods.php b/Model/Config/Source/PaymentMethods.php
new file mode 100644
index 0000000..74fbeb9
--- /dev/null
+++ b/Model/Config/Source/PaymentMethods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Config\Source;
+
+class PaymentMethods extends \Magento\Framework\App\Config\Value
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 'AMEX', 'label' => __('American Express')],
+            ['value' => 'VISA', 'label' => __('Visa')],
+            ['value' => 'DISCOVER', 'label' => __('Discover')],
+            ['value' => 'JCB', 'label' => __('Japanese Credit Bank')],
+            ['value' => 'MASTERCARD', 'label' => __('Master Card')]
+        ];
+    }
+}
diff --git a/Model/Mapping/Service.php b/Model/Mapping/Service.php
index fdbc1c5..c9955d1 100644
--- a/Model/Mapping/Service.php
+++ b/Model/Mapping/Service.php
@@ -301,7 +301,10 @@ private function _getCardAddress($quote)
      private function _getPaymentDetails($paymentDetails)
     {
         $method = $paymentDetails['method'];
-
+        if ($paymentDetails['additional_data']['cc_type'] == "PAYWITHGOOGLE-SSL") {
+            return $paymentDetails['additional_data']['cc_type'];
+        }
+        
         if ($paymentDetails['additional_data']['cse_enabled']) {
             $details = array(
                 'cseEnabled' => $paymentDetails['additional_data']['cse_enabled'],
@@ -389,5 +392,34 @@ private function _getClientIPAddress()
         $remoteAddresses = explode(',', $_SERVER['REMOTE_ADDR']);
         return trim($remoteAddresses[0]);
     }
+    public function collectWalletOrderParameters(
+        $orderCode,
+        $quote,
+        $orderStoreId,
+        $paymentDetails
+    )
+    {
+        $reservedOrderId = $quote->getReservedOrderId();
+        if($paymentDetails['additional_data']['walletResponse']){
+            $walletResponse = (array)json_decode($paymentDetails['additional_data']['walletResponse']);
+            $paymentMethodData = (array)$walletResponse['paymentMethodData'];
+            $tokenizationData = (array)$paymentMethodData['tokenizationData'];
+            $token = (array)json_decode($tokenizationData['token']);
 
+            return array(
+                'orderCode'           => $orderCode,
+                'merchantCode'        => $this->worldpayHelper->getMerchantCode($paymentDetails['additional_data']['cc_type']),
+                'orderDescription'    => $this->_getOrderDescription($reservedOrderId),
+                'currencyCode'        => $quote->getQuoteCurrencyCode(),
+                'amount'              => $quote->getGrandTotal(),
+                'paymentType'         => $this->_getRedirectPaymentType($paymentDetails),
+                'shopperEmail'        => $quote->getCustomerEmail(),
+                'method'              => $paymentDetails['method'],
+                'orderStoreId'        => $orderStoreId,
+                'protocolVersion'     => $token['protocolVersion'],
+                'signature'           => $token['signature'],
+                'signedMessage'       => $token['signedMessage']
+            );
+        }        
+    }
 }
diff --git a/Model/Observer/Redirect.php b/Model/Observer/Redirect.php
index ffee135..10da723 100644
--- a/Model/Observer/Redirect.php
+++ b/Model/Observer/Redirect.php
@@ -26,6 +26,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $redirecturl = $this->checkoutsession->getAdminWpRedirecturl();
             $this->checkoutsession->unsAdminWpRedirecturl();
             $this->_responseFactory->create()->setRedirect($redirecturl)->sendResponse();
+            die();
             return;
         }
     }
diff --git a/Model/PaymentMethods/AbstractMethod.php b/Model/PaymentMethods/AbstractMethod.php
index 5433d7c..8dfefac 100644
--- a/Model/PaymentMethods/AbstractMethod.php
+++ b/Model/PaymentMethods/AbstractMethod.php
@@ -45,6 +45,7 @@ abstract class AbstractMethod extends \Magento\Payment\Model\Method\AbstractMeth
     const DIRECT_MODEL = 'direct';
     const WORLDPAY_CC_TYPE = 'worldpay_cc';
     const WORLDPAY_APM_TYPE = 'worldpay_apm';
+    const WORLDPAY_WALLETS_TYPE = 'worldpay_wallets';
     const WORLDPAY_MOTO_TYPE = 'worldpay_moto';
     /**
      * Constructor
@@ -64,6 +65,7 @@ abstract class AbstractMethod extends \Magento\Payment\Model\Method\AbstractMeth
      * @param \Sapient\Worldpay\Model\Authorisation\TokenService $tokenservice
      * @param \Sapient\Worldpay\Model\Authorisation\MotoRedirectService $motoredirectservice
      * @param \Sapient\Worldpay\Model\Authorisation\HostedPaymentPageService $hostedpaymentpageservice
+     * @param \Sapient\Worldpay\Model\Authorisation\WalletService $walletService
      * @param \Sapient\Worldpay\Helper\Registry $registryhelper
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Sapient\Worldpay\Helper\Data $worldpayhelper
@@ -95,6 +97,7 @@ public function __construct(
         \Sapient\Worldpay\Model\Authorisation\TokenService $tokenservice,
         \Sapient\Worldpay\Model\Authorisation\MotoRedirectService $motoredirectservice,
         \Sapient\Worldpay\Model\Authorisation\HostedPaymentPageService $hostedpaymentpageservice,
+        \Sapient\Worldpay\Model\Authorisation\WalletService $walletService,
         \Sapient\Worldpay\Helper\Registry $registryhelper,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Sapient\Worldpay\Helper\Data $worldpayhelper,
@@ -129,6 +132,7 @@ public function __construct(
         $this->redirectservice = $redirectservice;
         $this->tokenservice = $tokenservice;
         $this->hostedpaymentpageservice = $hostedpaymentpageservice;
+        $this->walletService = $walletService;
         $this->quoteRepository = $quoteRepository;
         $this->registryhelper = $registryhelper;
         $this->urlbuilder = $urlBuilder;
@@ -174,6 +178,7 @@ public function getOrderPlaceRedirectUrl()
 
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount){
 
+        
         $mageOrder = $payment->getOrder();
         $quote = $this->quoteRepository->get($mageOrder->getQuoteId());
         if($this->authSession->isLoggedIn()) {
@@ -184,11 +189,13 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
         }
 
         $orderCode = $this->_generateOrderCode($quote);
+        $this->authSession->setCurrencyCode($quote->getQuoteCurrencyCode());
         $this->paymentdetailsdata = self::$paymentDetails;
-
         try {
             $this->validatePaymentData(self::$paymentDetails);
-            $this->_checkpaymentapplicable($quote);
+            if(self::$paymentDetails['method'] != self::WORLDPAY_WALLETS_TYPE){
+                $this->_checkpaymentapplicable($quote);
+            }
             $this->_checkShippingApplicable($quote);
             $this->_createWorldPayPayment($payment,$orderCode,$quote->getStoreId(),$quote->getReservedOrderId());
             $authorisationService = $this->getAuthorisationService($quote->getStoreId());
@@ -200,6 +207,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
                 self::$paymentDetails,
                 $payment
             );
+            $this->authSession->setOrderCode($orderCode);
         } catch (Exception $e) {
             $this->_wplogger->error($e->getMessage());
             $this->_wplogger->error('Authorising payment failed.');
@@ -208,6 +216,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
             throw new \Magento\Framework\Exception\LocalizedException(
                 __($errormessage)
             );
+            $this->authSession->setOrderCode(false);
         }
 
     }
@@ -249,6 +258,8 @@ public function validatePaymentData($paymentData){
             }
         } elseif ($method == self::WORLDPAY_APM_TYPE && !isset($paymentData['additional_data']['cc_type'])) {
              throw new Exception($generalErrorMessage, 1);
+        } elseif ($method == self::WORLDPAY_WALLETS_TYPE && !isset($paymentData['additional_data']['cc_type'])) {
+            throw new Exception($generalErrorMessage, 1);
         }
     }
 
@@ -274,6 +285,9 @@ private function _createWorldPayPayment(\Magento\Payment\Model\InfoInterface $pa
     {
         $paymentdetails = self::$paymentDetails;
         $integrationType = $this->worlpayhelper->getIntegrationModelByPaymentMethodCode($payment->getMethod(),$storeId);
+        if ($paymentdetails['method'] == self::WORLDPAY_WALLETS_TYPE) {
+            $integrationType = 'direct';
+        }
         $wpp = $this->worldpaypayment->create();
         $wpp->setData('order_id',$orderId);
         $wpp->setData('payment_status',\Sapient\Worldpay\Model\Payment\State::STATUS_SENT_FOR_AUTHORISATION);
@@ -395,9 +409,9 @@ protected function _checkpaymentapplicable($quote){
         $billingaddress = $quote->getBillingAddress();
         $countryId = $billingaddress->getCountryId();
         $paymenttypes = json_decode($this->paymenttypes->getPaymentType($countryId));
-        if(!in_array($type, $paymenttypes)){
-             throw new Exception('Payment Type not valid for the billing country');
-        }
+//        if(!in_array($type, $paymenttypes)){
+//             throw new Exception('Payment Type not valid for the billing country');
+//        }
     }
 
     /**
@@ -464,4 +478,4 @@ protected function _addtransaction($payment, $amount)
 
 
 
-}
+}
\ No newline at end of file
diff --git a/Model/PaymentMethods/Wallets.php b/Model/PaymentMethods/Wallets.php
new file mode 100644
index 0000000..708653b
--- /dev/null
+++ b/Model/PaymentMethods/Wallets.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\PaymentMethods;
+/**
+ * WorldPay CreditCards class extended from WorldPay Abstract Payment Method.
+ */
+class Wallets extends \Sapient\Worldpay\Model\PaymentMethods\AbstractMethod
+{
+    /**
+     * Payment code
+     * @var string
+     */
+    protected $_code = 'worldpay_wallets';
+    protected $_isGateway = true;
+    protected $_canAuthorize = true;
+    protected $_canUseInternal = false;
+    protected $_canUseCheckout = true;
+
+    /**
+     * Authorize payment abstract method
+     *
+     * @param \Magento\Framework\DataObject|InfoInterface $payment
+     * @param float $amount
+     * @return $this
+     */
+    public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
+    {
+        $this->_wplogger->info('WorldPay Wallets Payment Method Executed:');
+        parent::authorize($payment, $amount);
+        return $this;
+    }
+
+    public function getAuthorisationService($storeId)
+    {
+        return $this->walletService;
+    }
+
+    /**
+     * check if apm is enabled
+     * @return bool
+     */
+    public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
+    {
+       if ($this->worlpayhelper->isWorldPayEnable()) {
+         return true;
+       }
+       return false;
+    }
+
+    public function getTitle()
+    {
+        if($order = $this->registry->registry('current_order')) {
+            return $this->worlpayhelper->getPaymentTitleForOrders($order, $this->_code, $this->worldpaypayment);
+        }else if($invoice = $this->registry->registry('current_invoice')){
+            $order = $this->worlpayhelper->getOrderByOrderId($invoice->getOrderId());
+            return $this->worlpayhelper->getPaymentTitleForOrders($order, $this->_code, $this->worldpaypayment);
+        }else if($creditMemo = $this->registry->registry('current_creditmemo')){
+            $order = $this->worlpayhelper->getOrderByOrderId($creditMemo->getOrderId());
+            return $this->worlpayhelper->getPaymentTitleForOrders($order, $this->_code, $this->worldpaypayment);
+        }else{
+            return $this->worlpayhelper->getWalletsTitle();
+        }
+    }
+    
+    
+    
+//    public function getTitle()
+//    {
+//        return 'worldpay_wallets';
+//    }
+}
diff --git a/Model/Request/PaymentServiceRequest.php b/Model/Request/PaymentServiceRequest.php
index 23864c9..2d5655f 100644
--- a/Model/Request/PaymentServiceRequest.php
+++ b/Model/Request/PaymentServiceRequest.php
@@ -460,4 +460,66 @@ public function paymentOptionsByCountry($paymentOptionsParams)
             $this->worldpayhelper->getXmlPassword($paymentOptionsParams['paymentType'])
         );
     }
+
+    /**
+     * Send wallet order XML to Worldpay server
+     *
+     * @param array $walletOrderParams
+     * @return mixed
+     */
+    public function walletsOrder($walletOrderParams)
+    {
+        $this->_wplogger->info('########## Submitting wallet order request. OrderCode: ' . $walletOrderParams['orderCode'] . ' ##########');
+
+        $this->xmlredirectorder = new \Sapient\Worldpay\Model\XmlBuilder\WalletOrder();
+        $walletSimpleXml = $this->xmlredirectorder->build(
+            $walletOrderParams['merchantCode'],
+            $walletOrderParams['orderCode'],
+            $walletOrderParams['orderDescription'],
+            $walletOrderParams['currencyCode'],
+            $walletOrderParams['amount'],
+            $walletOrderParams['paymentType'],
+            $walletOrderParams['shopperEmail'],
+            $walletOrderParams['protocolVersion'],
+            $walletOrderParams['signature'],
+            $walletOrderParams['signedMessage']
+        );
+
+        return $this->_sendRequest(
+            dom_import_simplexml($walletSimpleXml)->ownerDocument,
+            $this->worldpayhelper->getXmlUsername($walletOrderParams['paymentType']),
+            $this->worldpayhelper->getXmlPassword($walletOrderParams['paymentType'])
+        );
+    }
+    
+     /**
+     * Send chromepay order XML to Worldpay server
+     *
+     * @param array $chromepayOrderParams
+     * @return mixed
+     */
+    public function chromepayOrder($chromeOrderParams)
+    {
+        $this->_wplogger->info('########## Submitting chromepay order request. OrderCode: ' . $chromeOrderParams['orderCode'] . ' ##########');
+        $paymentType = 'worldpay_cc';
+        $this->xmlredirectorder = new \Sapient\Worldpay\Model\XmlBuilder\ChromePayOrder();
+        $chromepaySimpleXml = $this->xmlredirectorder->build(
+            $chromeOrderParams['merchantCode'],
+            $chromeOrderParams['orderCode'],
+            $chromeOrderParams['orderDescription'],
+            $chromeOrderParams['currencyCode'],
+            $chromeOrderParams['amount'],
+            $chromeOrderParams['paymentType'],
+            $chromeOrderParams['paymentDetails'],
+            $chromeOrderParams['shippingAddress'],
+            $chromeOrderParams['billingAddress'],
+            $chromeOrderParams['shopperEmail']
+        );
+        //echo $this->worldpayhelper->getXmlUsername($paymentType);exit;
+        return $this->_sendRequest(
+            dom_import_simplexml($chromepaySimpleXml)->ownerDocument,
+            $this->worldpayhelper->getXmlUsername($paymentType),
+            $this->worldpayhelper->getXmlPassword($paymentType)
+        );
+    }
 }
diff --git a/Model/Utilities/PaymentMethods.php b/Model/Utilities/PaymentMethods.php
index 3713765..d7bb64a 100644
--- a/Model/Utilities/PaymentMethods.php
+++ b/Model/Utilities/PaymentMethods.php
@@ -79,6 +79,8 @@ protected function _getConfigCode($type)
                 return 'cc_config';
             case 'worldpay_apm':
                 return 'apm_config';
+            case 'worldpay_wallets':
+                return 'wallets_config';
             default:
                 return 'apm_config';
         }
diff --git a/Model/WorldpayConfigProvider.php b/Model/WorldpayConfigProvider.php
index 9c20ee6..04e974c 100644
--- a/Model/WorldpayConfigProvider.php
+++ b/Model/WorldpayConfigProvider.php
@@ -24,7 +24,8 @@ class WorldpayConfigProvider implements ConfigProviderInterface
      */
     protected $methodCodes = [
         'worldpay_cc',
-        'worldpay_apm'
+        'worldpay_apm',
+        'worldpay_wallets'
     ];
 
     /**
@@ -110,7 +111,10 @@ public function getConfig()
                 $config['payment']['minimum_amount'] = $this->payment->getMinimumAmount();
                 if ($code=='worldpay_cc') {
                     $config['payment']['ccform']["availableTypes"][$code] = $this->getCcTypes();
-                } else {
+                } else if ($code=='worldpay_wallets') {
+                    $config['payment']['ccform']["availableTypes"][$code] = $this->getWalletsTypes($code);
+                } 
+                else {
                     $config['payment']['ccform']["availableTypes"][$code] = $this->getApmTypes($code);
                 }
                 $config['payment']['ccform']["hasVerification"][$code] = true;
@@ -132,11 +136,25 @@ public function getConfig()
                 $config['payment']['ccform']['savedCardList'] = $this->getSaveCardList();
                 $config['payment']['ccform']['saveCardAllowed'] = $this->worldpayHelper->getSaveCard();
                 $config['payment']['ccform']['apmtitle'] = $this->getApmtitle();
+                $config['payment']['ccform']['walletstitle'] = $this->getWalletstitle();
                 $config['payment']['ccform']['paymentMethodSelection'] = $this->getPaymentMethodSelection();
                 $config['payment']['ccform']['paymentTypeCountries'] = $this->paymentmethodutils->getPaymentTypeCountries();
                 $config['payment']['ccform']['savedCardCount'] = count($this->getSaveCardList());
                 $config['payment']['ccform']['apmIdealBanks'] = $this->getApmIdealBankList();
                 $config['payment']['ccform']['wpicons'] = $this->getIcons();
+
+                $config['payment']['ccform']['isGooglePayEnable'] = $this->worldpayHelper->isGooglePayEnable();
+                $config['payment']['ccform']['googlePaymentMethods'] = $this->worldpayHelper->googlePaymentMethods();
+                $config['payment']['ccform']['googleAuthMethods'] = $this->worldpayHelper->googleAuthMethods();
+                $config['payment']['ccform']['googleGatewayMerchantname'] = $this->worldpayHelper->googleGatewayMerchantname();
+                $config['payment']['ccform']['googleGatewayMerchantid'] = $this->worldpayHelper->googleGatewayMerchantid();
+                $config['payment']['ccform']['googleMerchantname'] = $this->worldpayHelper->googleMerchantname();
+                $config['payment']['ccform']['googleMerchantid'] = $this->worldpayHelper->googleMerchantid();
+                if ($this->worldpayHelper->getEnvironmentMode()=='Live Mode'){
+                   $config['payment']['general']['environmentMode'] = "PRODUCTION";
+                }else{
+                    $config['payment']['general']['environmentMode'] = "TEST";
+                }
             }
         }
         return $config;
@@ -193,6 +211,14 @@ public function getApmTypes($code)
     {
         return $this->worldpayHelper->getApmTypes($code);
     }
+    
+    /**
+     * @return Array
+     */
+    public function getWalletsTypes($code)
+    {
+        return $this->worldpayHelper->getWalletsTypes($code);
+    }
 
     public function getMonths()
     {
@@ -253,6 +279,14 @@ public function getApmtitle()
     {
         return $this->worldpayHelper->getApmTitle();
     }
+    
+    /**
+     * @return String
+     */
+    public function getWalletstitle()
+    {
+        return $this->worldpayHelper->getWalletstitle();
+    }
 
     /**
      * @return boolean
@@ -298,7 +332,9 @@ public function getIcons()
         }
 
         $types = $this->worldpayHelper->getCcTypes();
+        $types['VISA_DEBIT-SSL'] = 'Visa debit';
         $apmTypes = $this->worldpayHelper->getApmTypes('worldpay_apm');
+        $walletsTypes = $this->worldpayHelper->getWalletsTypes('worldpay_wallets');
         $allTypePayments = array_unique (array_merge ($types, $apmTypes));
         foreach (array_keys($allTypePayments) as $code) {
             if (!array_key_exists($code, $this->icons)) {
diff --git a/Model/XmlBuilder/ChromePayOrder.php b/Model/XmlBuilder/ChromePayOrder.php
new file mode 100644
index 0000000..78fdfcc
--- /dev/null
+++ b/Model/XmlBuilder/ChromePayOrder.php
@@ -0,0 +1,396 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\XmlBuilder;
+
+use \Sapient\Worldpay\Logger\WorldpayLogger;
+
+/**
+ * Build xml for Direct Order request
+ */
+class ChromePayOrder
+{
+
+    const EXPONENT = 2;
+    const ALLOW_INTERACTION_TYPE = 'MOTO';
+    const DYNAMIC3DS_DO3DS = 'do3DS';
+    const DYNAMIC3DS_NO3DS = 'no3DS';
+    const TOKEN_SCOPE = 'shopper';
+    const ROOT_ELEMENT = <<<EOD
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE paymentService PUBLIC '-//WorldPay/DTD WorldPay PaymentService v1//EN'
+        'http://dtd.worldpay.com/paymentService_v1.dtd'> <paymentService/>
+EOD;
+
+    private $merchantCode;
+    private $orderCode;
+    private $orderDescription;
+    private $currencyCode;
+    private $amount;
+    protected $paymentDetails;
+    //private $cardAddress;
+    protected $shopperEmail;
+    protected $acceptHeader;
+    protected $userAgentHeader;
+    private $shippingAddress;
+    private $billingAddress;
+    private $echoData = null;
+
+    /**
+     * @var Sapient\Worldpay\Model\XmlBuilder\Config\TokenConfiguration
+     */
+    protected $tokenRequestConfig;
+
+    /**
+     * Constructor
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        //$this->tokenRequestConfig = new \Sapient\Worldpay\Model\XmlBuilder\Config\TokenConfiguration($args['tokenRequestConfig']);
+    }
+
+    /**
+     * Build xml for processing Request
+     *
+     * @param string $merchantCode
+     * @param string $orderCode
+     * @param string $orderDescription
+     * @param string $currencyCode
+     * @param float $amount
+     * @param array $paymentDetails
+     * @param array $cardAddress
+     * @param string $shopperEmail
+     * @param string $acceptHeader
+     * @param string $userAgentHeader
+     * @param string $shippingAddress
+     * @param float $billingAddress
+     * @param string $shopperId
+     * @return SimpleXMLElement $xml
+     */
+    public function build(
+        $merchantCode,
+        $orderCode,
+        $orderDescription,
+        $currencyCode,
+        $amount,
+        $paymentType,
+        $paymentDetails,
+        //$cardAddress,
+        //$acceptHeader,
+        //$userAgentHeader,
+        $shippingAddress,
+        $billingAddress,
+        //$shopperId,
+        $shopperEmail
+    ) {
+        $this->merchantCode = $merchantCode;
+        $this->orderCode = $orderCode;
+        $this->orderDescription = $orderDescription;
+        $this->currencyCode = $currencyCode;
+        $this->amount = $amount;
+        $this->paymentType = $paymentType;
+        $this->paymentDetails = $paymentDetails;
+        //$this->cardAddress = $cardAddress;
+        $this->shippingAddress = $shippingAddress;
+        $this->billingAddress = $billingAddress;
+        $this->shopperEmail = $shopperEmail;
+        //$this->acceptHeader = $acceptHeader;
+        //$this->userAgentHeader = $userAgentHeader;
+
+        $xml = new \SimpleXMLElement(self::ROOT_ELEMENT);
+        $xml['merchantCode'] = $this->merchantCode;
+        $xml['version'] = '1.4';
+
+        $submit = $this->_addSubmitElement($xml);
+        $this->_addOrderElement($submit);
+
+        return $xml;
+    }
+
+    /**
+     * Add submit tag to xml
+     *
+     * @param SimpleXMLElement $xml
+     * @return SimpleXMLElement
+     */
+    private function _addSubmitElement($xml)
+    {
+        return $xml->addChild('submit');
+    }
+
+    /**
+     * Add order and its child tag to xml
+     *
+     * @param SimpleXMLElement $submit
+     * @return SimpleXMLElement $order
+     */
+    private function _addOrderElement($submit)
+    {
+        $order = $submit->addChild('order');
+        $order['orderCode'] = $this->orderCode;
+        $this->_addDescriptionElement($order);
+        $this->_addAmountElement($order);
+        $this->_addPaymentDetailsElement($order);
+        $this->_addShopperElement($order);
+        $this->_addShippingElement($order);
+        $this->_addBillingElement($order);
+
+
+        if ($this->echoData) {
+            $order->addChild('echoData', $this->echoData);
+        }
+
+        //$this->_addCreateTokenElement($order);
+        //$this->_addDynamicInteractionTypeElement($order);
+
+       return $order;
+    }
+
+    /**
+     * Add description  tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addDescriptionElement($order)
+    {
+        $description = $order->addChild('description');
+        $this->_addCDATA($description, $this->orderDescription);
+    }
+
+    /**
+     * Add amount and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addAmountElement($order)
+    {
+        $amountElement = $order->addChild('amount');
+        $amountElement['currencyCode'] = $this->currencyCode;
+        $amountElement['exponent'] = self::EXPONENT;
+        $amountElement['value'] = $this->_amountAsInt($this->amount);
+    }
+    
+    /**
+     * Add paymentDetails and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    protected function _addPaymentDetailsElement($order)
+    {
+        $paymentDetailsElement = $order->addChild('paymentDetails');
+        
+        $this->_addPaymentDetailsForCreditCardOrder($paymentDetailsElement);
+        //$session = $paymentDetailsElement->addChild('session');
+        //$session['id'] = $this->paymentDetails['sessionId'];
+        //$session['shopperIPAddress'] = $this->paymentDetails['shopperIpAddress'];
+    }
+    
+    /**
+     * Add dynamicInteractionType and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addDynamicInteractionTypeElement($order)
+    {
+        if (self::ALLOW_INTERACTION_TYPE == $this->paymentDetails['dynamicInteractionType']) {
+            $interactionElement = $order->addChild('dynamicInteractionType');
+            $interactionElement['type'] = $this->paymentDetails['dynamicInteractionType'];
+        }
+    }
+
+    /**
+     * Add createToken and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addCreateTokenElement($order)
+    {
+
+       $createTokenElement = $order->addChild('createToken');
+       $createTokenElement['tokenScope'] = self::TOKEN_SCOPE;
+
+        if ($this->tokenRequestConfig->getTokenReason($this->orderCode)) {
+            $createTokenElement->addChild(
+                'tokenReason',
+                $this->tokenRequestConfig->getTokenReason($this->orderCode)
+            );
+        }
+    }
+
+    /**
+     * Add paymentDetailsElement and its child tag to xml
+     *
+     * @param SimpleXMLElement $paymentDetailsElement
+     */
+    protected function _addPaymentDetailsForCreditCardOrder($paymentDetailsElement)
+    {
+        $paymentTypeElement = $this->_addPaymentTypeElement($paymentDetailsElement);
+        $cardAddress = $paymentTypeElement->addChild('cardAddress');
+
+        $this->_addAddressElement(
+            $cardAddress,
+            $this->billingAddress->recipient,
+            $this->billingAddress->addressLine[0],
+            $this->billingAddress->postalCode,
+            $this->billingAddress->city,
+            $this->billingAddress->country
+        );
+    }
+
+    
+
+    /**
+     * Add CSE-DATA and its child tag to xml
+     *
+     * @param SimpleXMLElement $paymentDetailsElement
+     * @return SimpleXMLElement cseElement
+     */
+    protected function _addCseElement($paymentDetailsElement)
+    {
+        $cseElement = $paymentDetailsElement->addChild('CSE-DATA');
+        $cseElement->addChild('encryptedData', $this->paymentDetails['encryptedData']);
+
+        return $cseElement;
+    }
+
+    /**
+     * Add paymentType and its child tag to xml
+     *
+     * @param SimpleXMLElement $paymentDetailsElement
+     * @return SimpleXMLElement $paymentTypeElement
+     */
+    protected function _addPaymentTypeElement($paymentDetailsElement)
+    {
+        $paymentTypeElement = $paymentDetailsElement->addChild($this->paymentType);
+        $paymentTypeElement->addChild('cardNumber', $this->paymentDetails->cardNumber);
+
+        $expiryDate = $paymentTypeElement->addChild('expiryDate');
+        $date = $expiryDate->addChild('date');
+        $date['month'] = $this->paymentDetails->expiryMonth;
+        $date['year'] = $this->paymentDetails->expiryYear;
+
+        $paymentTypeElement->addChild('cardHolderName', $this->paymentDetails->cardholderName);
+
+        if (isset($this->paymentDetails->cardSecurityCode)) {
+            $paymentTypeElement->addChild('cvc', $this->paymentDetails->cardSecurityCode);
+        }
+
+        return $paymentTypeElement;
+    }
+
+    /**
+     * Add shopper and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    protected function _addShopperElement($order)
+    {
+        $shopper = $order->addChild(self::TOKEN_SCOPE);
+
+        $shopper->addChild('shopperEmailAddress', $this->shopperEmail);
+
+        //$shopper->addChild('authenticatedShopperID', $this->paymentDetails['customerId']);
+
+        $browser = $shopper->addChild('browser');
+
+//        $acceptHeader = $browser->addChild('acceptHeader');
+//        $this->_addCDATA($acceptHeader, $this->acceptHeader);
+//
+//        $userAgentHeader = $browser->addChild('userAgentHeader');
+//        $this->_addCDATA($userAgentHeader, $this->userAgentHeader);
+
+        return $shopper;
+    }
+
+    /**
+     * Add shippingAddress and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addShippingElement($order)
+    {
+        $shippingAddress = $order->addChild('shippingAddress');
+        $this->_addAddressElement(
+            $shippingAddress,
+            $this->shippingAddress->recipient,
+            $this->shippingAddress->addressLine[0],
+            $this->shippingAddress->postalCode,
+            $this->shippingAddress->city,
+            $this->shippingAddress->country
+        );
+    }
+
+    /**
+     * Add billing and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addBillingElement($order)
+    {
+        $billingAddress = $order->addChild('billingAddress');
+        $this->_addAddressElement(
+            $billingAddress,
+            $this->billingAddress->recipient,
+            $this->billingAddress->addressLine[0],
+            $this->billingAddress->postalCode,
+            $this->billingAddress->city,
+            $this->billingAddress->country
+        );
+    }
+
+    /**
+     * Add address and its child tag to xml
+     *
+     * @param SimpleXMLElement $parentElement
+     * @param string $firstName
+     * @param string $lastName
+     * @param string $street
+     * @param string $postalCode
+     * @param string $city
+     * @param string $countryCode
+     */
+    private function _addAddressElement($parentElement, $firstName, $street, $postalCode, $city, $countryCode)
+    {
+        $address = $parentElement->addChild('address');
+
+        $firstNameElement = $address->addChild('firstName');
+        $this->_addCDATA($firstNameElement, $firstName);
+
+//        $lastNameElement = $address->addChild('lastName');
+//        $this->_addCDATA($lastNameElement, $lastName);
+
+        $streetElement = $address->addChild('street');
+        $this->_addCDATA($streetElement, $street);
+
+        $postalCodeElement = $address->addChild('postalCode');
+        $this->_addCDATA($postalCodeElement, $postalCode);
+
+        $cityElement = $address->addChild('city');
+        $this->_addCDATA($cityElement, $city);
+
+        $countryCodeElement = $address->addChild('countryCode');
+        $this->_addCDATA($countryCodeElement, $countryCode);
+    }
+
+    /**
+     * @param SimpleXMLElement $element
+     * @param string $content
+     */
+    protected function _addCDATA($element, $content)
+    {
+        $node = dom_import_simplexml($element);
+        $no   = $node->ownerDocument;
+        $node->appendChild($no->createCDATASection($content));
+    }
+
+    /**
+     * @param float $amount
+     * @return int
+     */
+    private function _amountAsInt($amount)
+    {
+        return round($amount, self::EXPONENT, PHP_ROUND_HALF_EVEN) * pow(10, self::EXPONENT);
+    }
+}
diff --git a/Model/XmlBuilder/WalletOrder.php b/Model/XmlBuilder/WalletOrder.php
new file mode 100644
index 0000000..be1d994
--- /dev/null
+++ b/Model/XmlBuilder/WalletOrder.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\XmlBuilder;
+
+use Sapient\Worldpay\Model\XmlBuilder\Config\ThreeDSecureConfig;
+
+/**
+ * Build xml for RedirectOrder request
+ */
+class WalletOrder
+{
+    const EXPONENT = 2;
+    const ROOT_ELEMENT = <<<EOD
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE paymentService PUBLIC '-//WorldPay/DTD WorldPay PaymentService v1//EN'
+        'http://dtd.worldpay.com/paymentService_v1.dtd'> <paymentService/>
+EOD;
+
+    private $merchantCode;
+    private $orderCode;
+    private $orderDescription;
+    private $currencyCode;
+    private $amount;
+    private $paymentType;
+
+    /**
+     * Build xml for processing Request
+     *
+     * @param string $merchantCode
+     * @param string $orderCode
+     * @param string $orderDescription
+     * @param string $currencyCode
+     * @param float $amount
+     * @param string $paymentType
+     * @return SimpleXMLElement $xml
+     */
+    public function build(
+        $merchantCode,
+        $orderCode,
+        $orderDescription,
+        $currencyCode,
+        $amount,
+        $paymentType,
+        $shopperEmail,
+        $protocolVersion,
+        $signature,
+        $signedMessage
+    ) {
+        $this->merchantCode = $merchantCode;
+        $this->orderCode = $orderCode;
+        $this->orderDescription = $orderDescription;
+        $this->currencyCode = $currencyCode;
+        $this->amount = $amount;
+        $this->paymentType = $paymentType;
+        $this->shopperEmail = $shopperEmail;
+        $this->protocolVersion = $protocolVersion;
+        $this->signature = $signature;
+        $this->signedMessage = $signedMessage;
+        $xml = new \SimpleXMLElement(self::ROOT_ELEMENT);
+        $xml['merchantCode'] = $this->merchantCode;
+        $xml['version'] = '1.4';
+
+        $submit = $this->_addSubmitElement($xml);
+        $this->_addOrderElement($submit);
+
+        return $xml;
+    }
+
+    /**
+     * Add submit tag to xml
+     *
+     * @param SimpleXMLElement $xml
+     * @return SimpleXMLElement
+     */
+    private function _addSubmitElement($xml)
+    {
+        return $xml->addChild('submit');
+    }
+
+    /**
+     * Add order tag to xml
+     *
+     * @param SimpleXMLElement $submit
+     * @return SimpleXMLElement $order
+     */
+    private function _addOrderElement($submit)
+    {
+        $order = $submit->addChild('order');
+        $order['orderCode'] = $this->orderCode;
+        $order['shopperLanguageCode'] = "en";
+
+        $this->_addDescriptionElement($order);
+        $this->_addAmountElement($order);
+        $this->_addPaymentDetailsElement($order);
+        $this->_addShopperElement($order);
+        return $order;
+    }
+
+    /**
+     * Add description tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addDescriptionElement($order)
+    {
+        $description = $order->addChild('description');
+        $this->_addCDATA($description, $this->orderDescription);
+    }
+
+    /**
+     * Add amount tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addAmountElement($order)
+    {
+        $amountElement = $order->addChild('amount');
+        $amountElement['currencyCode'] = $this->currencyCode;
+        $amountElement['exponent'] = self::EXPONENT;
+        $amountElement['value'] = $this->_amountAsInt($this->amount);
+    }
+
+    /**
+     * Add PaymentDetails and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addPaymentDetailsElement($order)
+    {
+        $paymentDetails = $order->addChild('paymentDetails');
+
+        $paymentType = $paymentDetails->addChild($this->paymentType);
+        $paymentType->addChild('protocolVersion', $this->protocolVersion);
+        $paymentType->addChild('signature', $this->signature);
+        $paymentType->addChild('signedMessage', $this->signedMessage);
+    }
+
+    /**
+     * Add shopper and its child tag to xml
+     *
+     * @param SimpleXMLElement $order
+     */
+    private function _addShopperElement($order)
+    {
+        $shopper = $order->addChild('shopper');
+
+        $shopper->addChild('shopperEmailAddress', $this->shopperEmail);
+    }
+
+    /**
+     * @param SimpleXMLElement $element
+     * @param string $content
+     */
+    private function _addCDATA($element, $content)
+    {
+        $node = dom_import_simplexml($element);
+        $no   = $node->ownerDocument;
+        $node->appendChild($no->createCDATASection($content));
+    }
+
+    /**
+     * @param float $amount
+     * @return int
+     */
+    private function _amountAsInt($amount)
+    {
+        return round($amount, self::EXPONENT, PHP_ROUND_HALF_EVEN) * pow(10, self::EXPONENT);
+    }
+}
diff --git a/Plugin/CsrfValidatorDisable.php b/Plugin/CsrfValidatorDisable.php
new file mode 100644
index 0000000..17759ff
--- /dev/null
+++ b/Plugin/CsrfValidatorDisable.php
@@ -0,0 +1,23 @@
+<?php
+namespace Sapient\Worldpay\Plugin;
+
+class CsrfValidatorDisable
+{
+    /**
+     * @param \Magento\Framework\App\Request\CsrfValidator $subject
+     * @param \Closure $proceed
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Framework\App\ActionInterface $action
+     */
+    public function aroundValidate(
+        $subject,
+        \Closure $proceed,
+        $request,
+        $action
+    ) {
+        if ($request->getModuleName() == 'worldpay') {
+            return; // Disable CSRF check
+        }
+        $proceed($request, $action); // Proceed Magento 2 core functionalities
+    }
+}
\ No newline at end of file
diff --git a/Plugin/PaymentInformationManagement.php b/Plugin/PaymentInformationManagement.php
index d17f512..afbd342 100644
--- a/Plugin/PaymentInformationManagement.php
+++ b/Plugin/PaymentInformationManagement.php
@@ -74,8 +74,8 @@ public function aroundSavePaymentInformationAndPlaceOrder(
             $orderId = $this->cartManagement->placeOrder($cartId);
         } catch (LocalizedException $exception) {
             $this->logger->error($exception->getMessage());
-            //throw new CouldNotSaveException(__($exception->getMessage()));
-            throw new CouldNotSaveException(__('Mentioned card details are already saved, try with other card!'),$exception);
+            throw new CouldNotSaveException(__($exception->getMessage()));
+            //throw new CouldNotSaveException(__('Mentioned card details are already saved, try with other card!'),$exception);
         } catch (\Exception $exception) {
             $this->logger->error($exception->getMessage());
             throw new CouldNotSaveException(
diff --git a/Worldpay User Document.pdf b/Worldpay User Document.pdf
index fc8d552..997643d 100644
Binary files a/Worldpay User Document.pdf and b/Worldpay User Document.pdf differ
diff --git a/composer.json b/composer.json
index bf9d04d..3d22890 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
       "magento/module-quote": ">=100.0.0",
       "magento/module-vault": ">=100.0.0"
    },
-   "version": "1.5.5",
+   "version": "2.0",
    "license":"proprietary",
    "autoload":{
       "files":[
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index d250c73..95e745b 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -103,6 +103,14 @@
                     <label>Enable Instant Purchase</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                
+                <field id="chromepay" translate="label" type="select" sortOrder="14" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Enable Chrome Pay</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="chromepay_button_name" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Chrome Pay Button Name</label>
+                </field>
             </group>
             <!--APM-->
             <group id="apm_config" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -120,8 +128,37 @@
                     <label>Title</label>
                 </field>
             </group>
+            <!--Mobile Wallets-->
+            <group id="wallets_config" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Mobile Wallets</label>
+                <field id="title" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Title</label>
+                </field>
+                <group id="google_pay_wallets_config" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <label>Google Pay</label>
+                    <!--Google Pay  enabled-->
+                    <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="paymentmethods" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Payment Methods</label>
+                        <source_model>Sapient\Worldpay\Model\Config\Source\PaymentMethods</source_model>
+                    </field>
+                    <field id="authmethods" translate="label" type="multiselect" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Auth Methods</label>
+                        <source_model>Sapient\Worldpay\Model\Config\Source\AuthMethods</source_model>
+                    </field>
+                    <field id="gateway_merchantname" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Merchant Name</label>
+                    </field> 
+                    <field id="gateway_merchantid" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>MerchantId</label>
+                    </field>             
+                </group>
+            </group>
             <!-- MOTO -->
-            <group id="moto_config" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="moto_config" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>MOTO</label>
                 <!--Apm enabled-->
                 <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -136,7 +173,7 @@
                     <label>Title</label>
                 </field>
             </group>
-            <group id="merchant_config" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="merchant_config" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Merchant Profile Override Configuration</label>
                 <field id="merchant_profile" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Merchant Profile Configuration</label>
@@ -144,7 +181,7 @@
                     <backend_model>Sapient\Worldpay\Model\System\Config\Backend\Merchantprofile</backend_model>
                 </field>
             </group>
-            <group id="custom_paymentpages" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="custom_paymentpages" translate="label" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Custom Payment Pages</label>
                 <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enabled</label>
@@ -158,7 +195,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
-            <group id="order_cleanup" translate="label" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="order_cleanup" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Order Cleanup</label>
                 <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enabled</label>
diff --git a/etc/config.xml b/etc/config.xml
index 15b6f4a..7dd019f 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -19,12 +19,21 @@
                 <integration_mode>direct</integration_mode>
                 <hpp_integration>full_page</hpp_integration>
                 <saved_card>0</saved_card>
+                <chromepay_enabled>1</chromepay_enabled>
             </cc_config>
             <apm_config>
                 <enabled>1</enabled>
                 <title>Alternative Payment Methods</title>
                 <paymentmethods>PAYPAL-EXPRESS,GIROPAY-SSL</paymentmethods>
             </apm_config>
+            <wallets_config>
+                <title>Wallets</title>
+                <google_pay_wallets_config>
+                    <enabled>1</enabled>
+                    <paymentmethods>AMEX,VISA,DISCOVER,JCB,MASTERCARD</paymentmethods>
+                    <authmethods>PAN_ONLY,CRYPTOGRAM_3DS</authmethods>
+                </google_pay_wallets_config>
+            </wallets_config>
             <moto_config>
                 <enabled>1</enabled>
                 <title>Moto</title>
@@ -94,6 +103,14 @@
                 <payment_action>authorize</payment_action>
                 <sort_order>11</sort_order>
             </worldpay_apm>
+            <worldpay_wallets>
+                <title>Wallets</title>
+                <model>Sapient\Worldpay\Model\PaymentMethods\Wallets</model>
+                <active>1</active>
+                <allow_specific>0</allow_specific>
+                <payment_action>authorize</payment_action>
+                <sort_order>11</sort_order>
+            </worldpay_wallets>
             <worldpay_moto>
                 <title>MOTO</title>
                 <model>Sapient\Worldpay\Model\PaymentMethods\Moto</model>
diff --git a/etc/cron_groups.xml b/etc/cron_groups.xml
index 4c7f08f..e089296 100644
--- a/etc/cron_groups.xml
+++ b/etc/cron_groups.xml
@@ -9,4 +9,13 @@
         <history_failure_lifetime>600</history_failure_lifetime>
         <use_separate_process>1</use_separate_process>
     </group>
+    <group id="worldpay_orders">
+        <schedule_generate_every>1</schedule_generate_every>
+        <schedule_ahead_for>4</schedule_ahead_for>
+        <schedule_lifetime>2</schedule_lifetime>
+        <history_cleanup_every>10</history_cleanup_every>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>600</history_failure_lifetime>
+        <use_separate_process>1</use_separate_process>
+    </group>
 </config>
\ No newline at end of file
diff --git a/etc/crontab.xml b/etc/crontab.xml
index a76b433..e0bad5b 100644
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -5,4 +5,9 @@
             <schedule>* * * * *</schedule>
         </job>
     </group>
+    <group id="worldpay_orders">
+        <job name="order_sync_status" instance="Sapient\Worldpay\Cron\OrderSyncStatus" method="execute">
+            <schedule>* * * * *</schedule>
+        </job>
+    </group>
 </config>
\ No newline at end of file
diff --git a/etc/di.xml b/etc/di.xml
index d0636ff..be9a2b0 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -14,6 +14,12 @@
             </argument>
         </arguments>
     </type>
+    
+    <type name="Magento\Framework\App\Request\CsrfValidator">
+        <plugin name="csrf_validator_disable" type="Sapient\Worldpay\Plugin\CsrfValidatorDisable" />
+    </type>
+
+
     <type name="Magento\Checkout\Model\GuestPaymentInformationManagement">
         <plugin name="WorldpayPaymentMessagesGuestPaymentInformationManagement" type="Sapient\Worldpay\Plugin\GuestPaymentInformationManagement" />
     </type>
@@ -27,6 +33,7 @@
                 <item name="worldpay_apm" xsi:type="string">worldpay_apm</item>
                 <item name="worldpay_moto" xsi:type="string">worldpay_moto</item>
                 <item name="worldpay_cc_vault" xsi:type="string">worldpay_cc_vault</item>
+                <item name="worldpay_wallets" xsi:type="string">worldpay_wallets</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/paymentmethods.xml b/etc/paymentmethods.xml
index fba68a8..d351d6b 100644
--- a/etc/paymentmethods.xml
+++ b/etc/paymentmethods.xml
@@ -441,4 +441,144 @@
             </MAESTRO-SSL>
         </types>
     </worldpay_moto>
+    <worldpay_wallets>
+        <title>Wallets</title>
+        <types>    
+            <APPLEPAY-SSL>
+                <title>Apple Pay</title>
+                <areas>
+                    <area>AU</area>
+                    <area>AT</area>
+                    <area>BE</area>
+                    <area>BR</area>
+                    <area>CA</area>
+                    <area>CN</area>
+                    <area>DK</area>
+                    <area>EG</area>
+                    <area>FI</area>
+                    <area>FR</area>
+                    <area>DE</area>
+                    <area>GH</area>
+                    <area>GR</area>
+                    <area>HK</area>
+                    <area>IN</area>
+                    <area>ID</area>
+                    <area>IE</area>
+                    <area>IT</area>
+                    <area>JP</area>
+                    <area>MY</area>
+                    <area>MX</area>
+                    <area>NL</area>
+                    <area>NZ</area>
+                    <area>NG</area>
+                    <area>NO</area>
+                    <area>PH</area>
+                    <area>PL</area>
+                    <area>PT</area>
+                    <area>RU</area>
+                    <area>SG</area>
+                    <area>ZA</area>
+                    <area>KR</area>
+                    <area>ES</area>
+                    <area>SE</area>
+                    <area>CH</area>
+                    <area>TH</area>
+                    <area>GB</area>
+                    <area>US</area>
+                    <area>VN</area>
+                </areas>
+                <capture_request>1</capture_request>
+            </APPLEPAY-SSL>
+            <PAYWITHGOOGLE-SSL>
+                <title>Google Pay</title>
+                <areas>
+                    <area>AU</area>
+                    <area>AT</area>
+                    <area>BE</area>
+                    <area>BR</area>
+                    <area>CA</area>
+                    <area>CN</area>
+                    <area>DK</area>
+                    <area>EG</area>
+                    <area>FI</area>
+                    <area>FR</area>
+                    <area>DE</area>
+                    <area>GH</area>
+                    <area>GR</area>
+                    <area>HK</area>
+                    <area>IN</area>
+                    <area>ID</area>
+                    <area>IE</area>
+                    <area>IT</area>
+                    <area>JP</area>
+                    <area>MY</area>
+                    <area>MX</area>
+                    <area>NL</area>
+                    <area>NZ</area>
+                    <area>NG</area>
+                    <area>NO</area>
+                    <area>PH</area>
+                    <area>PL</area>
+                    <area>PT</area>
+                    <area>RU</area>
+                    <area>SG</area>
+                    <area>ZA</area>
+                    <area>KR</area>
+                    <area>ES</area>
+                    <area>SE</area>
+                    <area>CH</area>
+                    <area>TH</area>
+                    <area>GB</area>
+                    <area>US</area>
+                    <area>VN</area>
+                </areas>
+                <capture_request>1</capture_request>
+            </PAYWITHGOOGLE-SSL>
+            <SAMSUNGPAY-SSL>
+                <title>Samsung Pay</title>
+                <areas>
+                    <area>AU</area>
+                    <area>AT</area>
+                    <area>BE</area>
+                    <area>BR</area>
+                    <area>CA</area>
+                    <area>CN</area>
+                    <area>DK</area>
+                    <area>EG</area>
+                    <area>FI</area>
+                    <area>FR</area>
+                    <area>DE</area>
+                    <area>GH</area>
+                    <area>GR</area>
+                    <area>HK</area>
+                    <area>IN</area>
+                    <area>ID</area>
+                    <area>IE</area>
+                    <area>IT</area>
+                    <area>JP</area>
+                    <area>MY</area>
+                    <area>MX</area>
+                    <area>NL</area>
+                    <area>NZ</area>
+                    <area>NG</area>
+                    <area>NO</area>
+                    <area>PH</area>
+                    <area>PL</area>
+                    <area>PT</area>
+                    <area>RU</area>
+                    <area>SG</area>
+                    <area>ZA</area>
+                    <area>KR</area>
+                    <area>ES</area>
+                    <area>SE</area>
+                    <area>CH</area>
+                    <area>TH</area>
+                    <area>GB</area>
+                    <area>US</area>
+                    <area>VN</area>
+                </areas>
+                <capture_request>1</capture_request>
+            </SAMSUNGPAY-SSL>
+        </types>
+    </worldpay_wallets>
 </paymentMethods>
diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
index d34e21f..adf8526 100644
--- a/view/frontend/layout/checkout_cart_index.xml
+++ b/view/frontend/layout/checkout_cart_index.xml
@@ -3,6 +3,13 @@
 	<body>
     	<referenceContainer name="additional.product.info">
        		 <block class="Magento\Framework\View\Element\Template" name="minicart.refresh" template="Sapient_Worldpay::checkout/cart/minicartrefresh.phtml"/>
-   		 </referenceContainer>
+   	</referenceContainer>
+        
+         <referenceBlock name="checkout.cart.methods.onepage.bottom">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="string">Sapient_Worldpay::onepage/link.phtml</argument>
+            </action>
+         </referenceBlock>
+    
 	</body>
 </page>
\ No newline at end of file
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 2d22ab3..83a3649 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -29,6 +29,9 @@
                                                                         <item name="worldpay_apm" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="worldpay_wallets" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
new file mode 100644
index 0000000..4526c2f
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Success Page</title>
+    </head>
+    <body>
+        <referenceBlock name="page.main.title">
+            <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="Magento_Checkout::button.phtml"/>
+            <action method="setPageTitle">
+                <argument translate="true" name="title" xsi:type="string">Thank you for your purchase!</argument>
+            </action>
+        </referenceBlock>
+        <referenceContainer name="content">
+            <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success" template="Sapient_Worldpay::success.phtml" cacheable="false">
+                <container name="order.success.additional.info" label="Order Success Additional Info"/>
+            </block>
+            <block class="Magento\Checkout\Block\Registration" name="checkout.registration" template="Magento_Checkout::registration.phtml" cacheable="false"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
new file mode 100644
index 0000000..6ead6a9
--- /dev/null
+++ b/view/frontend/layout/default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <script src="https://storage.googleapis.com/prshim/v1/payment-shim.js" src_type="url" />
+    </head>
+          
+      <body>
+        <referenceContainer name="header-wrapper">
+     <block class="Sapient\Worldpay\Block\Webpayment" name="sapient.web.payment" template="Sapient_Worldpay::webpayment.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
\ No newline at end of file
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 8ef686b..15e4529 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -1,7 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 var config = {
     map: {
         '*': {
             worldpay: 'https://payments.worldpay.com/resources/cse/js/worldpay-cse-1.0.1.min.js',
+            googlePay: 'https://pay.google.com/gp/p/js/pay.js',
+            "Magento_Checkout/js/sidebar": "Sapient_Worldpay/js/sidebar",
+            "Magento_Checkout/js/proceed-to-checkout": "Sapient_Worldpay/js/proceed-to-checkout",
+            "Magento_Checkout/template/minicart/content.html":
+                "Sapient_Worldpay/template/minicart/content.html",
+            "Magento_Checkout/js/view/minicart": "Sapient_Worldpay/js/minicart"
         }
     }
 };
diff --git a/view/frontend/templates/cart/minicart.phtml b/view/frontend/templates/cart/minicart.phtml
new file mode 100644
index 0000000..af63b15
--- /dev/null
+++ b/view/frontend/templates/cart/minicart.phtml
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+/** @var $block \Magento\Checkout\Block\Cart\Sidebar */
+?>
+
+<div data-block="minicart" class="minicart-wrapper">
+    <a class="action showcart" href="<?= /* @escapeNotVerified */ $block->getShoppingCartUrl() ?>"
+       data-bind="scope: 'minicart_content'">
+        <span class="text"><?= /* @escapeNotVerified */ __('My Cart') ?></span>
+        <span class="counter qty empty"
+              data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
+            <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
+            <span class="counter-label">
+            <!-- ko if: getCartParam('summary_count') -->
+                <!-- ko text: getCartParam('summary_count') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
+            <!-- /ko -->
+            </span>
+        </span>
+    </a>
+    <?php if ($block->getIsNeedToDisplaySideBar()): ?>
+        <div class="block block-minicart empty"
+             data-role="dropdownDialog"
+             data-mage-init='{"dropdownDialog":{
+                "appendTo":"[data-block=minicart]",
+                "triggerTarget":".showcart",
+                "timeout": "2000",
+                "closeOnMouseLeave": false,
+                "closeOnEscape": true,
+                "triggerClass":"active",
+                "parentClass":"active",
+                "buttons":[]}}'>
+            <div id="minicart-content-wrapper" data-bind="scope: 'minicart_content'">
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            </div>
+            <?= $block->getChildHtml('minicart.addons') ?>
+        </div>
+    <?php endif ?>
+    <script>
+        window.checkout = <?= /* @escapeNotVerified */ $block->getSerializedConfig() ?>;
+        window.customm = 'got it';
+         
+    </script>
+    <script type="text/x-magento-init">
+    {
+        "[data-block='minicart']": {
+            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+        },
+        "*": {
+            "Magento_Ui/js/block-loader": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
+        }
+    }
+    </script>
+</div>
+
+
diff --git a/view/frontend/templates/onepage/link.phtml b/view/frontend/templates/onepage/link.phtml
new file mode 100644
index 0000000..0451451
--- /dev/null
+++ b/view/frontend/templates/onepage/link.phtml
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+?>
+<?php if ($block->isPossibleOnepageCheckout()):?>
+    <button type="button" onclick="location.href='<?php echo $block->getCheckoutUrl() ?>'"
+            title="Proceed to Checkout"
+            class="action primary checkout"
+          
+        <span><?= /* @escapeNotVerified */ __('Proceed to Checkout') ?></span>
+    </button>
+<?php endif?>
+
+<br> <br>
+<button type="button" id='checkout-now-bottom'
+            data-role="proceed-to-checkout"
+            title="<?= /* @escapeNotVerified */ __('Checkout Now') ?>"
+            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"}}'
+            class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>"
+            <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
+        <span><?= /* @escapeNotVerified */ __('Checkout Now') ?></span>
+    </button>
+
+<script type="text/javascript">
+ if(window.ChromepayEnabled == 1 && window.ChromePaymentMode == 'direct') {
+    var buttonObj = document.getElementById("checkout-now-bottom");
+    buttonObj.value = window.ChromepayButtonName;
+    buttonObj.innerHTML = window.ChromepayButtonName;
+ }else{
+     document.getElementById('checkout-now-bottom').style.visibility='hidden';
+ }
+</script>
diff --git a/view/frontend/templates/success.phtml b/view/frontend/templates/success.phtml
new file mode 100644
index 0000000..0741f86
--- /dev/null
+++ b/view/frontend/templates/success.phtml
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<script>
+require([
+     'Magento_Customer/js/customer-data'
+ ], function (customerData) {
+     var sections = ['cart'];
+     customerData.invalidate(sections);
+     customerData.reload(sections, true);
+ });
+</script>
+
+<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
+<div class="checkout-success">
+    <?php if ($block->getOrderId()):?>
+        <?php if ($block->getCanViewOrder()) :?>
+            <p><?= __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeHtml($block->getViewOrderUrl()), $block->escapeHtml($block->getOrderId()))) ?></p>
+        <?php  else :?>
+            <p><?= __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
+        <?php endif;?>
+            <p><?= /* @escapeNotVerified */ __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
+    <?php endif;?>
+
+    <?= $block->getAdditionalInfoHtml() ?>
+
+    <div class="actions-toolbar">
+        <div class="primary">
+            <a class="action primary continue" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span></a>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/templates/webpayment.phtml b/view/frontend/templates/webpayment.phtml
new file mode 100644
index 0000000..46387de
--- /dev/null
+++ b/view/frontend/templates/webpayment.phtml
@@ -0,0 +1,451 @@
+<?php
+$param = $this->getRequest()->getParams();
+if (array_key_exists('chromepay', $param)) {
+    ?>
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+        var request = initPaymentRequest();
+        onBuyClicked(request);
+        }, false);</script>
+
+    <?php
+}
+
+if (array_key_exists('error', $param)) {
+    $this->_messageManager->addError(__("Error occurred, please check your card details."));
+}
+
+$cusToken = 'Bearer ' . $block->getCustomerToken();
+
+/** @var $block \Sapient\Worldpay\Block\Webpayment */
+?>
+
+<script type="text/javascript">
+    window.ChromepayButtonName = '<?= $block->getChromepayButtonName() ?>';
+    window.ChromepayEnabled = '<?= $block->getChromepayEnabled() ?>';
+    window.ChromePaymentMode = '<?= $block->getPaymentMode() ?>';</script>
+
+<script>
+    //Global variables
+    var carrierCode;
+    var token = '<?= $cusToken ?>';
+    var cardType;
+    var totalAmount;
+    var baseUrl = '<?= $block->getBaseUrl() ?>';
+    var baseCurrency = '<?= $block->getCurrency() ?>';
+    var orderCode;
+    var reqShipping = <?= $block->getshippingRequired() ?>;
+    function initPaymentRequest() {
+
+    const networks = [
+            "amex", "mastercard", "visa"
+    ];
+    const types = ['credit'];
+    const supportedInstruments = [{
+    supportedMethods: 'basic-card',
+            data: {
+            supportedNetworks: networks,
+                    supportedTypes: types
+            }
+    }];
+    var isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
+    var guestMaskedQuoteId = window.checkoutConfig.quoteData.entity_id;
+    var isDownlodable = <?= $block->checkDownloadableProduct() ?>;
+    const details = {
+    displayItems: [
+
+<?php foreach ($block->getAllItems() as $item) { ?>
+        {
+        label: "<?= $item->getData('name') ?>",
+                amount: { currency: '<?= $block->getCurrency() ?>', value: '<?= $item->getData('price') ?>' }
+        },
+<?php } ?>
+
+    {
+    label: 'Subtotal',
+            amount: { currency: '<?= $block->getCurrency() ?>', value: '<?= $block->getSubTotal() ?>' }
+    },
+    {
+    label: 'Shipping',
+            amount: {currency: '<?= $block->getCurrency() ?>', value: '<?= $block->getShippingRate() ?>'},
+            pending: true,
+    },
+    {
+    label: 'Tax',
+            amount: {currency: '<?= $block->getCurrency() ?>', value: '<?= $block->getTaxRate() ?>'},
+            pending: true,
+    },
+    ],
+            total: {
+            label: 'Total',
+                    amount: { currency: '<?= $block->getCurrency() ?>', value: '<?= $block->getTotal() ?>' }
+            },
+    };  
+    var options = {
+    requestShipping: reqShipping,
+            requestPayerEmail: true,
+            requestPayerPhone: true,
+            requestPayerName: true
+    }; 
+    /**
+     * Updates the shipping price and the total based on the shipping address.
+     *
+     * @private
+     * @param {PaymentDetails} details The line items and shipping options.
+     * @param {PaymentAddress} shippingAddress User's preferred shipping address to
+     * use for shipping price calculations.
+     * @param {function} callback The callback to invoke with updated line items and
+     * shipping options.
+     */
+
+    //ajax req for available shipping method
+
+    function updateDetails(details, shippingOption, shippingAddress, resolve, reject) {
+        var k;
+        var selectedOptIndex;
+        for (k = 0; k < details.shippingOptions.length; k++) {
+        if (details.shippingOptions[k].id == shippingOption) {
+        selectedOptIndex = k;
+        break;
+        }
+        }
+
+        carrierCode = details.shippingOptions[selectedOptIndex].carrier;
+        var newShippingAmount = Number(details.shippingOptions[selectedOptIndex].amount.value);
+        var newTotal = Number(<?= $block->getSubTotal() ?>) + newShippingAmount;
+        selectedShippingOption = details.shippingOptions[selectedOptIndex];
+        var productCount = Number(<?= $block->getProductCount() ?>);
+        var shippingPosition = Number(productCount + 1);
+        details.total.amount.value = newTotal;
+        totalAmount = newTotal;
+        details.displayItems[shippingPosition].amount.value = newShippingAmount;
+        selectedShippingOption.selected = true;
+        var totals = updateTotals(carrierCode, shippingAddress);
+        if(totals){            
+            var taxPosition = Number(productCount + 2);
+            details.displayItems[taxPosition].amount.value = totals.base_tax_amount;
+            // Update total after tax
+            details.total.amount.value = totals.base_grand_total;
+        }
+        resolve(details);
+    }  // end of updateDetails fn
+    
+    function updateTotals(carrierCode, shippingAddress){
+        var countryCode = shippingAddress.country;
+        var req = {
+            'addressInformation' : {
+                'address' : {
+                    'countryId' : countryCode,
+                    'region':"",
+                    'postcode':null
+                },
+                'shipping_method_code' : carrierCode,
+                'shipping_carrier_code' : carrierCode
+            }
+        }
+        var jsonReq = JSON.stringify(req);
+        var totalsUrl;
+        if (isCustomerLoggedIn) { //Api for logged inb customer
+            totalsUrl = baseUrl + 'rest/default/V1/carts/mine/totals-information';
+        } else { // Api for guest customer
+            totalsUrl = baseUrl + 'rest/default/V1/guest-carts/' + guestMaskedQuoteId + '/totals-information';
+        }
+        var xhttp = new XMLHttpRequest();
+        xhttp.open("POST", totalsUrl, false);
+        xhttp.setRequestHeader("Content-type", "application/json");
+        if (isCustomerLoggedIn) {
+        xhttp.setRequestHeader("Authorization", token);
+        }
+        xhttp.send(jsonReq);
+        var totals = JSON.parse(xhttp.responseText);
+        return totals;
+    } //--------------end of updateTotals fn -----------
+    
+
+    function updateDetailsAddress(details, request, resolve, reject) {
+        var countryCode = request.country;
+        var req = {
+        'address' : {
+        'country_id' : ''
+        }
+        };
+        req.address.country_id = request.country;
+        var jsonReq = JSON.stringify(req);
+        var apiUrl;
+        if (isCustomerLoggedIn) { //Api for logged inb customer
+            apiUrl = baseUrl + 'rest/default/V1/carts/mine/estimate-shipping-methods';
+        } else { // Api for guest customer
+            apiUrl = baseUrl + 'rest/default/V1/guest-carts/' + guestMaskedQuoteId + '/estimate-shipping-methods';
+        }
+        var xhttp = new XMLHttpRequest();
+        xhttp.open("POST", apiUrl, false);
+        xhttp.setRequestHeader("Content-type", "application/json");
+        if (isCustomerLoggedIn) {
+        xhttp.setRequestHeader("Authorization", token);
+        }
+        xhttp.send(jsonReq);
+        var shippindMethods = JSON.parse(xhttp.responseText);
+        var shippingOptionsNew = [];
+        for (i = 0; i < shippindMethods.length; i++) {
+        shippingOptionsNew.push({
+        id: shippindMethods[i].method_code,
+                label: shippindMethods[i].carrier_title,
+                carrier: shippindMethods[i].carrier_code,
+                amount: {currency: '<?= $block->getCurrency() ?>', value: shippindMethods[i].amount},
+                selected: false,
+        });
+        }
+        details.shippingOptions = shippingOptionsNew;
+        resolve(details);
+    } //--------------- end of updateDetailsAddress -------------
+
+
+    // Initialization
+    var request = new PaymentRequest(supportedInstruments, details, options);
+    request.addEventListener('shippingaddresschange', function(evt) {
+        evt.updateWith(new Promise(function(resolve, reject) {
+            updateDetailsAddress(details, request.shippingAddress, resolve, reject);
+        }));
+    });
+    //Update shipping rate by selected shipping method
+    request.addEventListener('shippingoptionchange', function(evt) {
+        evt.updateWith(new Promise(function(resolve, reject) {
+            updateDetails(details, request.shippingOption, request.shippingAddress, resolve, reject);
+        }));
+    });
+    return request;
+    } // ------------- End of initPaymentRequest fn ---------------
+
+    /**
+     * Invokes PaymentRequest for credit cards.
+     *
+     * @param {PaymentRequest} request The PaymentRequest object.
+     */
+    function onBuyClicked(request) {
+
+    var isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
+    var isDownlodable = <?= $block->checkDownloadableProduct() ?>;
+    if (isCustomerLoggedIn == false && isDownlodable == true) {
+        var error = 'Please log in to continue';
+        alert(error);
+        throw(error);
+    }
+
+    request.show().then(function(instrumentResponse) {
+        orderCode = createOrder(instrumentResponse);
+        console.log('order created');
+        console.log(orderCode);
+        console.log('REDIRECTING');
+        if (instrumentResponse && orderCode){
+           // window.location.href = baseUrl + 'checkout/onepage/success';
+            window.location.href = baseUrl + 'worldpay/threedsecure/auth';
+        }
+    }).catch(function(err) {
+        throw(err);
+    });
+    } // ----------------- End of onBuyClicked fn --------------------
+
+    /**
+     * Simulates processing the payment data on the server.
+     *
+     * @param {instrumentResponse} instrumentResponse The payment information to
+     * process.
+     */
+    function createOrder(instrumentResponse) {
+    var guestMaskedQuoteId = window.checkoutConfig.quoteData.entity_id;
+    var apiUrl;
+    var orderResponse;
+    if (isCustomerLoggedIn) { //Api for logged in customer
+        apiUrl = baseUrl + 'rest/default/V1/carts/mine/shipping-information';
+    } else { // Api for guest customer
+        apiUrl = baseUrl + 'rest/default/V1/guest-carts/' + guestMaskedQuoteId + '/shipping-information';
+    }
+    
+    
+    var fullName = instrumentResponse.details.billingAddress.recipient;
+    var strArray = fullName.split(" ");
+    var firstName = strArray[0];
+    var lastName;
+    //firstname will be used as lastname incase user dont have lastname (Magento validation)
+    if (strArray[1]) {
+    lastName = strArray[1];
+    } else {
+    lastName = firstName;
+    }
+
+    //Add shipping information to the cart
+    // region id will be used as 0 as default (Magento validation)
+    var customerDetails = {  "addressInformation": {
+    "shipping_address": {
+    "region": "",
+            "region_id": 0,
+            "region_code": "",
+            "country_id": "",
+            "street": [
+                    ""
+            ],
+            "postcode": "",
+            "city": "",
+            "firstname": "",
+            "lastname": "",
+            "email": "",
+            "telephone": ""
+    },
+            "billing_address": {
+            "email": instrumentResponse.payerEmail,
+                    "region": instrumentResponse.details.billingAddress.city,
+                    "region_id": 0,
+                    "region_code": instrumentResponse.details.billingAddress.region,
+                    "country_id": instrumentResponse.details.billingAddress.country,
+                    "street": instrumentResponse.details.billingAddress.addressLine,
+                    "postcode": instrumentResponse.details.billingAddress.postalCode,
+                    "city": instrumentResponse.details.billingAddress.city,
+                    "telephone": instrumentResponse.details.billingAddress.phone,
+                    "firstname": firstName,
+                    "lastname": lastName
+            },
+            "shipping_carrier_code": "",
+            "shipping_method_code": ""
+    }
+    }
+
+   
+
+    if (instrumentResponse.shippingAddress) {
+    //shipping information
+    customerDetails.addressInformation.shipping_address.region = instrumentResponse.shippingAddress.city;
+    customerDetails.addressInformation.shipping_address.region_id = 0;
+    customerDetails.addressInformation.shipping_address.region_code = instrumentResponse.shippingAddress.region;
+    customerDetails.addressInformation.shipping_address.country_id = instrumentResponse.shippingAddress.country;
+    customerDetails.addressInformation.shipping_address.street = instrumentResponse.shippingAddress.addressLine;
+    customerDetails.addressInformation.shipping_address.postcode = instrumentResponse.shippingAddress.postalCode;
+    customerDetails.addressInformation.shipping_address.city = instrumentResponse.shippingAddress.city;
+    customerDetails.addressInformation.shipping_address.telephone = instrumentResponse.shippingAddress.phone;
+    customerDetails.addressInformation.shipping_address.firstname = firstName;
+    customerDetails.addressInformation.shipping_address.lastname = lastName;
+    }
+
+    //Shipping information
+    customerDetails.addressInformation.shipping_carrier_code = carrierCode;
+    customerDetails.addressInformation.shipping_method_code = instrumentResponse.shippingOption;
+    
+    var jsonCustomerDetails = JSON.stringify(customerDetails);
+    let cardNo = instrumentResponse.details.cardNumber;
+    //Get the card type
+    cardType = getCardType(cardNo);
+    
+    if (instrumentResponse.shippingAddress) {
+    var xhttp = new XMLHttpRequest();
+    xhttp.open("POST", apiUrl, false);
+    xhttp.setRequestHeader("Content-type", "application/json");
+    xhttp.setRequestHeader("Authorization", token);
+    xhttp.send(jsonCustomerDetails);
+    }
+
+    //card details
+    let cardNumber = instrumentResponse.details.cardNumber;
+    let cvc = instrumentResponse.details.cardSecurityCode;
+    let cardholderName = instrumentResponse.details.cardholderName;
+    let expiryMonth = instrumentResponse.details.expiryMonth;
+    let expiryYear = instrumentResponse.details.expiryYear;
+    //Add payment information and place the order
+    var paymentDetails = {
+    "paymentMethod": {
+    "method": "worldpay_cc",
+            "additional_data": {
+            "cc_cid" : cvc,
+                    "cc_type" : cardType,
+                    "cc_exp_year" : expiryYear,
+                    "cc_exp_month" : expiryMonth,
+                    "cc_number" : cardNumber,
+                    "cc_name" : cardholderName,
+                    "save_my_card" : false,
+                    "cse_enabled" : false,
+                    "encryptedData" : null,
+                    "tokenCode" : null,
+                    "isSavedCardPayment" : false,
+                    "isChromePay" : "1"
+            }
+    },
+            "billing_address": {
+            "email": instrumentResponse.payerEmail,
+                    "region": instrumentResponse.details.billingAddress.city,
+                    "region_id": 0,
+                    "region_code": instrumentResponse.details.billingAddress.region,
+                    "country_id": instrumentResponse.details.billingAddress.country,
+                    "street": instrumentResponse.details.billingAddress.addressLine,
+                    "postcode": instrumentResponse.details.billingAddress.postalCode,
+                    "city": instrumentResponse.details.billingAddress.city,
+                    "telephone": instrumentResponse.details.billingAddress.phone,
+                    "firstname": firstName,
+                    "lastname": lastName
+            }
+    };
+    var jsonPaymentDetails = JSON.stringify(paymentDetails);
+    var orderApiUrl;
+    if (isCustomerLoggedIn) { //Api for logged in customer
+    orderApiUrl = baseUrl + 'rest/default/V1/carts/mine/payment-information';
+    } else { // Api for guest customer
+    orderApiUrl = baseUrl + 'rest/default/V1/guest-carts/' + guestMaskedQuoteId + '/order';
+    }
+
+    var xhttp = new XMLHttpRequest();
+    if (isCustomerLoggedIn) {
+    xhttp.open("POST", orderApiUrl, false);
+    } else {
+    xhttp.open("PUT", orderApiUrl, false);
+    }
+    xhttp.setRequestHeader("Content-type", "application/json");
+    xhttp.setRequestHeader("Authorization", token);
+    xhttp.send(jsonPaymentDetails);
+    var orderResponse = JSON.parse(xhttp.responseText);
+    console.log('got it');
+    console.log(orderResponse);
+   
+   if(isNaN(orderResponse)){
+        window.location.href = baseUrl + 'checkout/cart?error=true';
+        exit;
+    }
+   
+    return orderResponse;
+    }// --------------------- end of createOrder ----------------
+
+    function getCardType(cardNumber) {
+    // visa
+    var re = new RegExp("^4");
+    if (cardNumber.match(re) != null)
+            return "VISA-SSL";
+    // Mastercard 
+    // Updated for Mastercard 2017 BINs expansion
+    if (/^(5[1-5][0-9]{14}|2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12}))$/.test(cardNumber))
+            return "ECMC-SSL";
+    // AMEX
+    re = new RegExp("^3[47]");
+    if (cardNumber.match(re) != null)
+            return "AMEX-SSL";
+    // Discover
+    re = new RegExp("^(6011|622(12[6-9]|1[3-9][0-9]|[2-8][0-9]{2}|9[0-1][0-9]|92[0-5]|64[4-9])|65)");
+    if (cardNumber.match(re) != null)
+            return "DISCOVER-SSL";
+    // Diners
+    re = new RegExp("^36");
+    if (cardNumber.match(re) != null)
+            return "DINERS-SSL";
+    // Diners - Carte Blanche
+    re = new RegExp("^30[0-5]");
+    if (cardNumber.match(re) != null)
+            return "DINERS-SSL";
+    // JCB
+    re = new RegExp("^35(2[89]|[3-8][0-9])");
+    if (cardNumber.match(re) != null)
+            return "JCB-SSL";
+    // Visa Electron
+    re = new RegExp("^(4026|417500|4508|4844|491(3|7))");
+    if (cardNumber.match(re) != null)
+            return "VISA-SET";
+    re = new RegExp("^62|88");
+    if (cardNumber.match(re) != null)
+            return "CHINAUNIONPAY-SSL";
+    return "";
+    } //end of getCardType
+</script>
diff --git a/view/frontend/web/images/cc/visa_debit-ssl.png b/view/frontend/web/images/cc/visa_debit-ssl.png
new file mode 100644
index 0000000..120f377
Binary files /dev/null and b/view/frontend/web/images/cc/visa_debit-ssl.png differ
diff --git a/view/frontend/web/js/minicart.js b/view/frontend/web/js/minicart.js
new file mode 100644
index 0000000..6616e0b
--- /dev/null
+++ b/view/frontend/web/js/minicart.js
@@ -0,0 +1,202 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'Magento_Customer/js/customer-data',
+    'jquery',
+    'ko',
+    'underscore',
+    'sidebar',
+    'mage/translate',
+    'mage/dropdown'
+], function (Component, customerData, $, ko, _) {
+    'use strict';
+
+    var sidebarInitialized = false,
+        addToCartCalls = 0,
+        miniCart;
+
+    miniCart = $('[data-block=\'minicart\']');
+
+    /**
+     * @return {Boolean}
+     */
+    function initSidebar() {
+        if (miniCart.data('mageSidebar')) {
+            miniCart.sidebar('update');
+        }
+
+        if (!$('[data-role=product-item]').length) {
+            return false;
+        }
+        miniCart.trigger('contentUpdated');
+
+        if (sidebarInitialized) {
+            return false;
+        }
+        sidebarInitialized = true;
+        miniCart.sidebar({
+            'targetElement': 'div.block.block-minicart',
+            'url': {
+                'checkout': window.checkout.checkoutUrl,
+                'update': window.checkout.updateItemQtyUrl,
+                'remove': window.checkout.removeItemUrl,
+                'loginUrl': window.checkout.customerLoginUrl,
+                'isRedirectRequired': window.checkout.isRedirectRequired
+            },
+            'button': {
+                'checkout': '#top-cart-btn-checkout',
+                'remove': '#mini-cart a.action.delete',
+                'close': '#btn-minicart-close'
+            },
+            'showcart': {
+                'parent': 'span.counter',
+                'qty': 'span.counter-number',
+                'label': 'span.counter-label'
+            },
+            'minicart': {
+                'list': '#mini-cart',
+                'content': '#minicart-content-wrapper',
+                'qty': 'div.items-total',
+                'subtotal': 'div.subtotal span.price',
+                'maxItemsVisible': window.checkout.minicartMaxItemsVisible
+            },
+            'item': {
+                'qty': ':input.cart-item-qty',
+                'button': ':button.update-cart-item'
+            },
+            'confirmMessage': $.mage.__('Are you sure you would like to remove this item from the shopping cart?')
+        });
+    }
+
+    miniCart.on('dropdowndialogopen', function () {
+        initSidebar();
+    });
+    
+
+    return Component.extend({
+        shoppingCartUrl: window.checkout.shoppingCartUrl,
+        maxItemsToDisplay: window.checkout.maxItemsToDisplay,
+        checkoutNowUrl: window.checkout.shoppingCartUrl+'?chromepay=1',
+        proceedToCheckoutUrl: window.checkout.checkoutUrl,
+        
+        checkoutNowTitle: window.ChromepayButtonName,
+        chromepayEnabled: window.ChromepayEnabled,
+        chromePaymentMode: window.ChromePaymentMode,
+         
+        cart: {},
+
+        /**
+         * @override
+         */
+        initialize: function () {
+            var self = this,
+                cartData = customerData.get('cart');
+
+            this.update(cartData());
+            cartData.subscribe(function (updatedCart) {
+                addToCartCalls--;
+                this.isLoading(addToCartCalls > 0);
+                sidebarInitialized = false;
+                this.update(updatedCart);
+                initSidebar();
+            }, this);
+            $('[data-block="minicart"]').on('contentLoading', function () {
+                addToCartCalls++;
+                self.isLoading(true);
+            });
+
+            if (cartData()['website_id'] !== window.checkout.websiteId) {
+                customerData.reload(['cart'], false);
+            }
+
+            return this._super();
+        },
+        isLoading: ko.observable(false),
+        initSidebar: initSidebar,
+
+        /**
+         * Close mini shopping cart.
+         */
+        closeMinicart: function () {
+            $('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('close');
+        },
+
+        /**
+         * @return {Boolean}
+         */
+        closeSidebar: function () {
+            var minicart = $('[data-block="minicart"]');
+
+            minicart.on('click', '[data-action="close"]', function (event) {
+                event.stopPropagation();
+                minicart.find('[data-role="dropdownDialog"]').dropdownDialog('close');
+            });
+
+            return true;
+        },
+
+        /**
+         * @param {String} productType
+         * @return {*|String}
+         */
+        getItemRenderer: function (productType) {
+            return this.itemRenderer[productType] || 'defaultRenderer';
+        },
+
+        /**
+         * Update mini shopping cart content.
+         *
+         * @param {Object} updatedCart
+         * @returns void
+         */
+        update: function (updatedCart) {
+            _.each(updatedCart, function (value, key) {
+                if (!this.cart.hasOwnProperty(key)) {
+                    this.cart[key] = ko.observable();
+                }
+                this.cart[key](value);
+            }, this);
+        },
+
+        /**
+         * Get cart param by name.
+         * @param {String} name
+         * @returns {*}
+         */
+        getCartParam: function (name) {
+            if (!_.isUndefined(name)) {
+                if (!this.cart.hasOwnProperty(name)) {
+                    this.cart[name] = ko.observable();
+                }
+            }
+
+            return this.cart[name]();
+        },
+
+        /**
+         * Returns array of cart items, limited by 'maxItemsToDisplay' setting
+         * @returns []
+         */
+        getCartItems: function () {
+            var items = this.getCartParam('items') || [];
+
+            items = items.slice(parseInt(-this.maxItemsToDisplay, 10));
+
+            return items;
+        },
+
+        /**
+         * Returns count of cart line items
+         * @returns {Number}
+         */
+        getCartLineItemsCount: function () {
+            var items = this.getCartParam('items') || [];
+
+            return parseInt(items.length, 10);
+        }
+    });
+});
diff --git a/view/frontend/web/js/proceed-to-checkout.js b/view/frontend/web/js/proceed-to-checkout.js
new file mode 100644
index 0000000..ad6bce5
--- /dev/null
+++ b/view/frontend/web/js/proceed-to-checkout.js
@@ -0,0 +1,37 @@
+define([
+    'jquery',
+    'Magento_Customer/js/model/authentication-popup',
+    'Magento_Customer/js/customer-data'
+], function ($, authenticationPopup, customerData) {
+    'use strict';
+
+    return function (config, element) {
+
+        $(element).click(function (event) {
+            var cart = customerData.get('cart'),
+                customer = customerData.get('customer');
+
+            event.preventDefault();
+            //
+            // if (!customer().firstname && cart().isGuestCheckoutAllowed === false) {
+            //     authenticationPopup.showModal();
+            //
+            //     return false;
+            // }
+
+             if(window.PaymentRequest && window.ChromepayEnabled == 1 && window.ChromePaymentMode == 'direct') {
+                var request = initPaymentRequest();
+                onBuyClicked(request);
+                request = initPaymentRequest();
+                
+                console.log('got it 111');
+                
+                console.log(request);
+                //window.location = "http://worldpay.localhost:81/webpayment";
+            } else {
+                location.href = this.options.url.checkout;
+            }
+        });
+
+    };
+});
\ No newline at end of file
diff --git a/view/frontend/web/js/sidebar.js b/view/frontend/web/js/sidebar.js
new file mode 100644
index 0000000..1926b77
--- /dev/null
+++ b/view/frontend/web/js/sidebar.js
@@ -0,0 +1,330 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Customer/js/model/authentication-popup',
+    'Magento_Customer/js/customer-data',
+    'Magento_Ui/js/modal/alert',
+    'Magento_Ui/js/modal/confirm',
+    'jquery/ui',
+    'mage/decorate',
+    'mage/collapsible',
+    'mage/cookies'
+], function ($, authenticationPopup, customerData, alert, confirm) {
+    'use strict';
+
+    $.widget('mage.sidebar', {
+        options: {
+            isRecursive: true,
+            minicart: {
+                maxItemsVisible: 3
+            }
+        },
+        scrollHeight: 0,
+
+        /**
+         * Create sidebar.
+         * @private
+         */
+        _create: function () {
+            this._initContent();
+        },
+
+        /**
+         * Update sidebar block.
+         */
+        update: function () {
+            $(this.options.targetElement).trigger('contentUpdated');
+            this._calcHeight();
+            this._isOverflowed();
+        },
+
+        /**
+         * @private
+         */
+        _initContent: function () {
+            var self = this,
+                events = {};
+
+            this.element.decorate('list', this.options.isRecursive);
+
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['click ' + this.options.button.close] = function (event) {
+                event.stopPropagation();
+                $(self.options.targetElement).dropdownDialog('close');
+            };
+            events['click ' + this.options.button.checkout] = $.proxy(function () {
+                var cart = customerData.get('cart'),
+                    customer = customerData.get('customer');
+
+                if (!customer().firstname && cart().isGuestCheckoutAllowed === false) {
+                    // set URL for redirect on successful login/registration. It's postprocessed on backend.
+                    $.cookie('login_redirect', this.options.url.checkout);
+
+                    if (this.options.url.isRedirectRequired) {
+                        location.href = this.options.url.loginUrl;
+                    } else {
+                        authenticationPopup.showModal();
+                    }
+
+                    return false;
+                }
+
+                if(window.PaymentRequest && window.ChromepayEnabled == 1 && window.ChromePaymentMode == 'direct') {
+                    var request = initPaymentRequest();
+                    onBuyClicked(request);
+                    // request = initPaymentRequest();
+                } else {
+                    location.href = this.options.url.checkout;
+                }
+            }, this);
+
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['click ' + this.options.button.remove] =  function (event) {
+                event.stopPropagation();
+                confirm({
+                    content: self.options.confirmMessage,
+                    actions: {
+                        /** @inheritdoc */
+                        confirm: function () {
+                            self._removeItem($(event.currentTarget));
+                        },
+
+                        /** @inheritdoc */
+                        always: function (e) {
+                            e.stopImmediatePropagation();
+                        }
+                    }
+                });
+            };
+
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['keyup ' + this.options.item.qty] = function (event) {
+                self._showItemButton($(event.target));
+            };
+
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['click ' + this.options.item.button] = function (event) {
+                event.stopPropagation();
+                self._updateItemQty($(event.currentTarget));
+            };
+
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['focusout ' + this.options.item.qty] = function (event) {
+                self._validateQty($(event.currentTarget));
+            };
+
+            this._on(this.element, events);
+            this._calcHeight();
+            this._isOverflowed();
+        },
+
+        /**
+         * Add 'overflowed' class to minicart items wrapper element
+         *
+         * @private
+         */
+        _isOverflowed: function () {
+            var list = $(this.options.minicart.list),
+                cssOverflowClass = 'overflowed';
+
+            if (this.scrollHeight > list.innerHeight()) {
+                list.parent().addClass(cssOverflowClass);
+            } else {
+                list.parent().removeClass(cssOverflowClass);
+            }
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         */
+        _showItemButton: function (elem) {
+            var itemId = elem.data('cart-item'),
+                itemQty = elem.data('item-qty');
+
+            if (this._isValidQty(itemQty, elem.val())) {
+                $('#update-cart-item-' + itemId).show('fade', 300);
+            } else if (elem.val() == 0) { //eslint-disable-line eqeqeq
+                this._hideItemButton(elem);
+            } else {
+                this._hideItemButton(elem);
+            }
+        },
+
+        /**
+         * @param {*} origin - origin qty. 'data-item-qty' attribute.
+         * @param {*} changed - new qty.
+         * @returns {Boolean}
+         * @private
+         */
+        _isValidQty: function (origin, changed) {
+            return origin != changed && //eslint-disable-line eqeqeq
+                changed.length > 0 &&
+                changed - 0 == changed && //eslint-disable-line eqeqeq
+                changed - 0 > 0;
+        },
+
+        /**
+         * @param {Object} elem
+         * @private
+         */
+        _validateQty: function (elem) {
+            var itemQty = elem.data('item-qty');
+
+            if (!this._isValidQty(itemQty, elem.val())) {
+                elem.val(itemQty);
+            }
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         */
+        _hideItemButton: function (elem) {
+            var itemId = elem.data('cart-item');
+
+            $('#update-cart-item-' + itemId).hide('fade', 300);
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         */
+        _updateItemQty: function (elem) {
+            var itemId = elem.data('cart-item');
+
+            this._ajax(this.options.url.update, {
+                'item_id': itemId,
+                'item_qty': $('#cart-item-' + itemId + '-qty').val()
+            }, elem, this._updateItemQtyAfter);
+        },
+
+        /**
+         * Update content after update qty
+         *
+         * @param {HTMLElement} elem
+         */
+        _updateItemQtyAfter: function (elem) {
+            this._hideItemButton(elem);
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         */
+        _removeItem: function (elem) {
+            var itemId = elem.data('cart-item');
+
+            this._ajax(this.options.url.remove, {
+                'item_id': itemId
+            }, elem, this._removeItemAfter);
+        },
+
+        /**
+         * Update content after item remove
+         *
+         * @param {Object} elem
+         * @private
+         */
+        _removeItemAfter: function (elem) {
+            var productData = customerData.get('cart')().items.find(function (item) {
+                return Number(elem.data('cart-item')) === Number(item['item_id']);
+            });
+
+            $(document).trigger('ajax:removeFromCart', productData['product_sku']);
+        },
+
+        /**
+         * @param {String} url - ajax url
+         * @param {Object} data - post data for ajax call
+         * @param {Object} elem - element that initiated the event
+         * @param {Function} callback - callback method to execute after AJAX success
+         */
+        _ajax: function (url, data, elem, callback) {
+            $.extend(data, {
+                'form_key': $.mage.cookies.get('form_key')
+            });
+
+            $.ajax({
+                url: url,
+                data: data,
+                type: 'post',
+                dataType: 'json',
+                context: this,
+
+                /** @inheritdoc */
+                beforeSend: function () {
+                    elem.attr('disabled', 'disabled');
+                },
+
+                /** @inheritdoc */
+                complete: function () {
+                    elem.attr('disabled', null);
+                }
+            })
+                .done(function (response) {
+                    var msg;
+
+                    if (response.success) {
+                        callback.call(this, elem, response);
+                    } else {
+                        msg = response['error_message'];
+
+                        if (msg) {
+                            alert({
+                                content: msg
+                            });
+                        }
+                    }
+                })
+                .fail(function (error) {
+                    console.log(JSON.stringify(error));
+                });
+        },
+
+        /**
+         * Calculate height of minicart list
+         *
+         * @private
+         */
+        _calcHeight: function () {
+            var self = this,
+                height = 0,
+                counter = this.options.minicart.maxItemsVisible,
+                target = $(this.options.minicart.list),
+                outerHeight;
+
+            self.scrollHeight = 0;
+            target.children().each(function () {
+
+                if ($(this).find('.options').length > 0) {
+                    $(this).collapsible();
+                }
+                outerHeight = $(this).outerHeight();
+
+                if (counter-- > 0) {
+                    height += outerHeight;
+                }
+                self.scrollHeight += outerHeight;
+            });
+
+            target.parent().height(height);
+        }
+    });
+
+    return $.mage.sidebar;
+});
diff --git a/view/frontend/web/js/view/payment/method-renderer/apm-method.js b/view/frontend/web/js/view/payment/method-renderer/apm-method.js
index 1e23157..0cd566b 100644
--- a/view/frontend/web/js/view/payment/method-renderer/apm-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/apm-method.js
@@ -74,35 +74,34 @@ define(
                     serviceUrl, JSON.stringify(payload)
                 ).done(
                     function (apiresponse) {
-                           var response = JSON.parse(apiresponse);
-                            if(response.length){
-                               for (var responsekey in response) {
-                                       var found = false;
-                                      for(var key in ccavailabletypes) {
-                                            if(response[responsekey] == key.toUpperCase()){
-                                                found = true;
-                                                cckey = key;
-                                                ccvalue = ccavailabletypes[key];
-                                                break;
-                                            }
-                                      }
-
-                                      if(found){
-                                        filtercclist[cckey] = ccvalue;
-                                      }
+                        var response = JSON.parse(apiresponse);
+                        if(response.length){
+                            $.each(response, function(responsekey, value){
+                                var found = false;
+                                $.each(ccavailabletypes, function(key, value){
+                                    if(response[responsekey] == key.toUpperCase()){
+                                        found = true;
+                                        cckey = key;
+                                        ccvalue = ccavailabletypes[key];
+                                        return false;
+                                    }
+                                });
+                                if(found){
+                                    filtercclist[cckey] = ccvalue;
                                 }
-                             }else{
-                               filtercclist = ccavailabletypes;
-                             }
+                            });
+                        }else{
+                            filtercclist = ccavailabletypes;
+                        }
 
-                             var ccTypesArr1 = _.map(filtercclist, function (value, key) {
-                               return {
-                                'ccValue': key,
-                                'ccLabel': value
+                        var ccTypesArr1 = _.map(filtercclist, function (value, key) {
+                            return {
+                             'ccValue': key,
+                             'ccLabel': value
                             };
-                         });
+                        });
 
-                         fullScreenLoader.stopLoader();
+                        fullScreenLoader.stopLoader();
                         ccTypesArr(ccTypesArr1);
                     }
                 ).fail(
@@ -213,5 +212,3 @@ define(
         });
     }
 );
-
-
diff --git a/view/frontend/web/js/view/payment/method-renderer/cc-method.js b/view/frontend/web/js/view/payment/method-renderer/cc-method.js
index 2fb1cd6..f7b41fb 100644
--- a/view/frontend/web/js/view/payment/method-renderer/cc-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cc-method.js
@@ -122,24 +122,27 @@ define(
                     function (apiresponse) {
                            var response = JSON.parse(apiresponse);
                             if(response.length){
-                                if(savedcardlists.length > 0){
-                                for (var key in savedcardlists) {
-                                    var method = savedcardlists[key]['method'];
-                                    var found = false;
-                                    for (var responsekey in response) {
-                                        if(method.toUpperCase() == response[responsekey]){
-                                            found = true;
-                                            break;
+                                if (savedcardlists.length) {
+                                    $.each(savedcardlists, function(key, value){
+                                        var method = savedcardlists[key]['method'];
+                                        if (typeof method == 'undefined') {
+                                            return true;
                                         }
-                                    }
-
-                                    if(found){
-                                        filtercards.push(savedcardlists[key]);
-                                    }
+                                        // commented for saved debit card access
+//                                        var found = false;
+//                                        $.each(response, function(responsekey, value){
+//                                            if(method.toUpperCase() == response[responsekey]){
+//                                                found = true;
+//                                                return false;
+//                                            }
+//                                        });
+//                                        if(found){
+                                            filtercards.push(savedcardlists[key]);
+                                        //}
+                                    });
                                 }
-                            }
 
-                               for (var responsekey in response) {
+                                for (var responsekey in response) {
                                        var found = false;
                                       for(var key in ccavailabletypes) {
                                             if(key != 'savedcard'){
@@ -350,23 +353,27 @@ define(
                  }else if($form.validation() && $form.validation('isValid')){
                     //Direct form handle
                     this.saveMyCard = $('#' + this.getCode() + '_save_card').is(":checked");
-                    if (this.isClientSideEncryptionEnabled() && this.intigrationmode == 'direct') {
-                        var that = this;
-                        require(["https://payments.worldpay.com/resources/cse/js/worldpay-cse-1.0.1.min.js"], function(worldpay){
-                            worldpay.setPublicKey(that.getCsePublicKey());
-                            var cseData = {
-                                cvc: that.creditCardVerificationNumber(),
-                                cardHolderName: $('#' + that.getCode() + '_cc_name').val(),
-                                cardNumber: that.creditCardNumber(),
-                                expiryMonth: that.creditCardExpMonth(),
-                                expiryYear: that.creditCardExpYear()
-                            };
-                            var encryptedData = worldpay.encrypt(cseData);
-                            that.cseData = encryptedData;
-                            //place order with direct CSE method
-                            self.placeOrder();
-                        });
-                    } else if(this.intigrationmode == 'redirect'){
+                     if (this.intigrationmode == 'direct') {
+                            var that = this;
+                            if(this.isClientSideEncryptionEnabled()){
+                                require(["https://payments.worldpay.com/resources/cse/js/worldpay-cse-1.0.1.min.js"], function (worldpay) {
+                                    worldpay.setPublicKey(that.getCsePublicKey());
+                                    var cseData = {
+                                        cvc: that.creditCardVerificationNumber(),
+                                        cardHolderName: $('#' + that.getCode() + '_cc_name').val(),
+                                        cardNumber: that.creditCardNumber(),
+                                        expiryMonth: that.creditCardExpMonth(),
+                                        expiryYear: that.creditCardExpYear()
+                                    };
+                                    var encryptedData = worldpay.encrypt(cseData);
+                                    that.cseData = encryptedData;
+                                    //place order with direct CSE method
+                                    self.placeOrder();
+                                });
+                            } else{
+                                self.placeOrder();
+                            }
+                        }else if(this.intigrationmode == 'redirect'){
                         //place order with Redirect CSE Method
                         self.placeOrder();
                     }
@@ -385,4 +392,4 @@ define(
             }
         });
     }
-);
+);
\ No newline at end of file
diff --git a/view/frontend/web/js/view/payment/method-renderer/wallets-method.js b/view/frontend/web/js/view/payment/method-renderer/wallets-method.js
new file mode 100644
index 0000000..83862cf
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/wallets-method.js
@@ -0,0 +1,239 @@
+/*browser:true*/
+/*global define*/
+define(
+    [
+        'Magento_Payment/js/view/payment/cc-form',
+        'jquery',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Customer/js/model/customer',
+        'Magento_Payment/js/model/credit-card-validation/validator',
+        'mage/url',
+        'Magento_Checkout/js/action/place-order',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'ko',
+        'Magento_Checkout/js/action/set-payment-information',
+        'Magento_Checkout/js/model/error-processor',
+        'Magento_Checkout/js/model/url-builder',
+        'mage/storage',
+        'Magento_Checkout/js/model/full-screen-loader',
+        'googlePay'
+    ],
+    function (Component, $, quote, customer,validator, url, placeOrderAction, redirectOnSuccessAction,ko, setPaymentInformationAction, errorProcessor, urlBuilder, storage, fullScreenLoader, googlePay) {
+        'use strict';
+        var ccTypesArr = ko.observableArray([]);
+        var paymentService = false;
+        var billingAddressCountryId = "";
+        var googleResponse = "";
+        
+        /***** Google pay Elements Started  */
+        const baseRequest = {apiVersion: 2, apiVersionMinor: 0 };
+        const allowedCardNetworks = window.checkoutConfig.payment.ccform.googlePaymentMethods.split(",");
+        const allowedCardAuthMethods = window.checkoutConfig.payment.ccform.googleAuthMethods.split(",");
+        const tokenizationSpecification = {
+            type: 'PAYMENT_GATEWAY',
+            parameters: {
+                'gateway': window.checkoutConfig.payment.ccform.googleGatewayMerchantname,
+                'gatewayMerchantId': window.checkoutConfig.payment.ccform.googleGatewayMerchantid
+            }
+        };
+        
+        const baseCardPaymentMethod = {
+            type: 'CARD',
+            parameters: {
+                allowedAuthMethods: allowedCardAuthMethods,
+                allowedCardNetworks: allowedCardNetworks
+            }
+        };
+        const cardPaymentMethod = Object.assign(
+            {},
+            baseCardPaymentMethod,
+            {
+                tokenizationSpecification: tokenizationSpecification
+            }
+        );
+        
+        var paymentDataRequest = null;
+        var paymentsClient = null;
+        /***** Google pay Elements End  */
+
+        if (quote.billingAddress()) {
+            billingAddressCountryId = quote.billingAddress._latestValue.countryId;
+        }
+
+        function getGooglePaymentDataRequest(){
+            const paymentDataRequest = Object.assign({}, baseRequest);
+            paymentDataRequest.allowedPaymentMethods = [cardPaymentMethod];
+            paymentDataRequest.transactionInfo = getGoogleTransactionInfo();
+            paymentDataRequest.merchantInfo = {
+                // @todo a merchant ID is available for a production environment after approval by Google
+                // See {@link https://developers.google.com/pay/api/web/guides/test-and-deploy/integration-checklist|Integration checklist}
+                
+                merchantId: 'b21b1d14ba43077',
+                merchantName: window.checkoutConfig.payment.ccform.googleGatewayMerchantname
+            };
+            return paymentDataRequest;
+        }
+        function getGoogleTransactionInfo(){
+            return {
+                currencyCode: window.checkoutConfig.totalsData.base_currency_code,
+                totalPriceStatus: 'FINAL',
+                // set to cart total
+                totalPrice: parseFloat(window.checkoutConfig.totalsData.base_grand_total).toFixed(2)
+            };
+        }
+        function getGooglePaymentsClient() {
+            if ( paymentsClient === null ) {
+                    paymentsClient = new google.payments.api.PaymentsClient({environment: window.checkoutConfig.payment.general.environmentMode}); 
+               }
+            return paymentsClient;
+        }
+
+        return Component.extend({
+            defaults: {
+                redirectAfterPlaceOrder: false,
+                direcTemplate: 'Sapient_Worldpay/payment/wallets',
+                cardHolderName:'',
+                SavedcreditCardVerificationNumber:'',
+                cseData:null
+            },
+
+            initialize: function () {
+                this._super();
+                this.selectedCCType(null);
+                if(paymentService == false) {
+                    this.filterwalletajax(1);
+                }
+
+            },
+            initObservable: function () {
+                var that = this;
+                this._super();
+                quote.billingAddress.subscribe(function (newAddress) {
+                    if (quote.billingAddress._latestValue != null  && quote.billingAddress._latestValue.countryId != billingAddressCountryId) {
+                        billingAddressCountryId = quote.billingAddress._latestValue.countryId;
+                        that.filterwalletajax(1);
+                        paymentService = true;
+                    }
+                });
+            return this;
+            },
+            filterwalletajax: function(statusCheck = null){
+                if(!statusCheck){
+                    return;
+                }
+                if (quote.billingAddress._latestValue == null) {
+                    return;
+                }
+                var ccavailabletypes = this.getCcAvailableTypes();
+                var filtercclist = {};
+
+                fullScreenLoader.startLoader();
+                
+                filtercclist = ccavailabletypes;
+
+                var ccTypesArr1 = _.map(filtercclist, function (value, key) {
+                      return {
+                       'ccValue': key,
+                       'ccLabel': value
+                   };
+                });
+                fullScreenLoader.stopLoader();
+                ccTypesArr(ccTypesArr1);
+                //filtersavedcardLists(filtercards);
+            },
+
+            getCcAvailableTypesValues : function(){
+                return ccTypesArr;
+            },
+
+            availableCCTypes : function(){
+               return ccTypesArr;
+            },
+            selectedCCType : ko.observable(),
+            //paymentToken:ko.observable(),
+
+            getCode: function() {
+                return 'worldpay_wallets';
+            },
+
+            getTemplate: function(){
+                return this.direcTemplate;
+            },
+            
+             /**
+             * Get payment icons
+             * @param {String} type
+             * @returns {Boolean}
+             */
+            getIcons: function (type) {
+                return window.checkoutConfig.payment.ccform.wpicons.hasOwnProperty(type) ?
+                    window.checkoutConfig.payment.ccform.wpicons[type]
+                    : false;
+            },
+
+            getTitle: function() {
+               return window.checkoutConfig.payment.ccform.walletstitle ;
+            },
+            isActive: function() {
+                return true;
+            },
+            paymentMethodSelection: function() {
+                return window.checkoutConfig.payment.ccform.paymentMethodSelection;
+            },
+            getselectedCCType : function(){
+                if(this.paymentMethodSelection()=='radio'){
+                     return $("input[name='wallets_type']:checked").val();
+                    } else{
+                      return  this.selectedCCType();
+                }
+            },
+
+            /**
+             * @override
+             */
+            getData: function () {
+                return {
+                    'method': "worldpay_wallets",
+                    'additional_data': {
+                        'cc_type': this.getselectedCCType(),
+                        'walletResponse' : googleResponse
+                    }
+                };
+            },
+            preparePayment:function() {
+                var self = this;
+                var $form = $('#' + this.getCode() + '-form');
+				if(this.getselectedCCType()== undefined){
+					$('.mage-error').css({'display' : 'block','margin-bottom': '7px'});
+					$('.mage-error').html('Please select one of the options.');
+					return false;
+				}
+                if (this.getselectedCCType()=='PAYWITHGOOGLE-SSL') {
+                    const paymentsClient = getGooglePaymentsClient();
+                    const paymentDataRequest = getGooglePaymentDataRequest();
+                    paymentDataRequest.transactionInfo = getGoogleTransactionInfo();
+                    paymentsClient.loadPaymentData(paymentDataRequest)
+                    .then(function(paymentData) {
+                        googleResponse = JSON.stringify(paymentData);
+                        if($form.validation() && $form.validation('isValid')){
+                            self.placeOrder();
+                        }else {
+                            return $form.validation() && $form.validation('isValid');
+                        }
+                    })
+                    .catch(function(err) {
+                        // show error in developer console for debugging
+                        console.log('payment client resposnse else condition');
+                        console.error(err);
+                        return false;
+                    });
+                }
+                
+            },
+            afterPlaceOrder: function (data, event) {
+                window.location.replace(url.build('worldpay/wallets/success'));
+            }
+
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/methodrenderer.js b/view/frontend/web/js/view/payment/methodrenderer.js
index 72f83f9..e0be796 100644
--- a/view/frontend/web/js/view/payment/methodrenderer.js
+++ b/view/frontend/web/js/view/payment/methodrenderer.js
@@ -18,10 +18,12 @@ define(
         'use strict';
         var CCcomponent = 'Sapient_Worldpay/js/view/payment/method-renderer/cc-method';
         var APMcomponent = 'Sapient_Worldpay/js/view/payment/method-renderer/apm-method';
+        var Walletscomponent = 'Sapient_Worldpay/js/view/payment/method-renderer/wallets-method';
 
         var methods = [
             {type: 'worldpay_cc', component: CCcomponent},
-            {type: 'worldpay_apm', component: APMcomponent}
+            {type: 'worldpay_apm', component: APMcomponent},
+            {type: 'worldpay_wallets', component: Walletscomponent}
         ];
 
          $.each(methods, function (k, method) {
diff --git a/view/frontend/web/template/minicart/content.html b/view/frontend/web/template/minicart/content.html
new file mode 100644
index 0000000..7c6fb39
--- /dev/null
+++ b/view/frontend/web/template/minicart/content.html
@@ -0,0 +1,114 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="block-title">
+    <strong>
+        <span class="text" translate="'My Cart'"/>
+        <span
+            class="qty empty"
+            text="getCartParam('summary_count')"
+            data-bind="css: { empty: !!getCartParam('summary_count') == false },
+                       attr: { title: $t('Items in Cart') }">
+        </span>
+    </strong>
+</div>
+
+<div class="block-content">
+    <button type="button"
+            id="btn-minicart-close"
+            class="action close"
+            data-action="close"
+            data-bind="attr: { title: $t('Close') }">
+        <span translate="'Close'"/>
+    </button>
+
+    <if args="getCartParam('summary_count')">
+        <div class="items-total">
+            <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
+            <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
+            <span class="count" text="getCartLineItemsCount()"/>
+            <translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/>
+            <translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/>
+        </div>
+
+        <each args="getRegion('subtotalContainer')" render=""/>
+        <each args="getRegion('extraInfo')" render=""/>
+
+        <div class="actions" if="getCartParam('possible_onepage_checkout')">
+            <div class="primary">
+				
+				<a class="action viewcart" data-bind="attr: {href: proceedToCheckoutUrl}">
+                 <button 
+                        id="top-cart-btn-checkout-new"
+                        type="button"
+                        class="action primary checkout"
+                        data-action="close"
+                        data-bind="attr: {href: proceedToCheckoutUrl}"
+                        translate="'Proceed to Checkout'"
+                />
+                </a>
+                
+                <if args="chromepayEnabled == 1">
+                    <if args="chromePaymentMode == 'direct'">
+                <br><br>
+                <a class="action viewcart" data-bind="attr: {href: checkoutNowUrl}">
+                <button 
+                    id="checkout-now"
+                    type="button"
+                    class="action primary checkout"
+                    data-action="close"
+                    data-bind="attr: {href: checkoutNowUrl, title: checkoutNowTitle}, text: checkoutNowTitle"
+                />
+                </a>
+             </if>
+              </if>
+               
+                <div data-bind="html: getCartParam('extra_actions')"></div>
+            </div>
+        </div>
+    </if>
+
+    <if args="getCartParam('summary_count')">
+        <strong class="subtitle" translate="'Recently added item(s)'"/>
+        <div data-action="scroll" class="minicart-items-wrapper">
+            <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartItems(), as: 'item' }">
+                <each args="$parent.getRegion($parent.getItemRenderer(item.product_type))"
+                      render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"
+                />
+            </ol>
+        </div>
+    </if>
+
+    <ifnot args="getCartParam('summary_count')">
+        <strong class="subtitle empty"
+                data-bind="visible: closeSidebar()"
+                translate="'You have no items in your shopping cart.'"
+        />
+        <if args="getCartParam('cart_empty_message')">
+            <p class="minicart empty text" text="getCartParam('cart_empty_message')"/>
+            <div class="actions">
+                <div class="secondary">
+                    <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
+                        <span translate="'View and Edit Cart'"/>
+                    </a>
+                </div>
+            </div>
+        </if>
+    </ifnot>
+
+    <div class="actions" if="getCartParam('summary_count')">
+        <div class="secondary">
+            <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
+                <span translate="'View and Edit Cart'"/>
+            </a>
+        </div>
+    </div>
+
+    <div id="minicart-widgets" class="minicart-widgets">
+        <each args="getRegion('promotion')" render=""/>
+    </div>
+</div>
+<each args="getRegion('sign-in-popup')" render=""/>
diff --git a/view/frontend/web/template/payment/wallets.html b/view/frontend/web/template/payment/wallets.html
new file mode 100644
index 0000000..3a33592
--- /dev/null
+++ b/view/frontend/web/template/payment/wallets.html
@@ -0,0 +1,82 @@
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+     <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+    <div class="payment-method-content">
+
+        <form class="form" data-bind="attr: {'id': getCode() + '-form'}">
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
+            <div class="field type required" data-bind="attr: {id: getCode() + '_cc_type_div'}">
+                <!-- ko if: (paymentMethodSelection()=='radio')-->
+                
+                    <!-- ko foreach: {data: getCcAvailableTypesValues(), as: 'item'} -->
+                    
+                        <input type="radio"  data-bind="attr: {'value': item.ccValue, 'data-validate': JSON.stringify({
+                                        'validate-one-required-by-name':true
+                                                }),id: 'wallets_' + item.ccValue}" name="wallets_type" />
+                       <!--ko if: $parent.getIcons(item.ccValue) -->
+                            <label data-bind="attr: {for: 'wallets_' + item.ccValue}"><img data-bind="attr: {
+                                        'src': $parent.getIcons(item.ccValue).url,
+                                        'alt': item.ccLabel,
+                                        'width': $parent.getIcons(item.ccValue).width,
+                                        'height': $parent.getIcons(item.ccValue).height
+                                        }"></label>
+                        <!--/ko-->
+                        <!--ko ifnot: $parent.getIcons(item.ccValue) -->
+                            <label data-bind="attr: {for: 'wallets_' + item.ccValue}"><!-- ko text: item.ccLabel --><!-- /ko --></label>
+                        <!--/ko-->
+                    
+                <!--/ko-->
+                
+            <!-- /ko -->
+                <!-- ko if: (paymentMethodSelection()=='dropdown')-->
+                    <select name="wallets_type" class="select select-ccytpe"
+                                            data-bind="
+                                           attr: {id: getCode() + '_cc_type', 'data-container': getCode() + '-cc-type', 'data-validate': JSON.stringify({required:true})},
+                                           options: availableCCTypes(),
+                                           optionsText: 'ccLabel',
+                                           value: selectedCCType,
+                                            optionsValue: 'ccValue',
+                                           optionsCaption: 'Select Your Payment Method',
+                                           event:{ change: checkPaymentTypes }"></select>
+                <!--/ko-->
+                <div class="mage-error" generated="true"  id="saved-cvv-error"></div>
+            </div>
+        </fieldset>
+        </form>
+
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                            click: preparePayment,
+                            attr: {title: $t('Place Order')},
+                            css: {disabled: !isPlaceOrderActionAllowed()},
+                            enable: (getCode() == isChecked())
+                            "
+                        disabled>
+                    <span data-bind="text: $t('Place Order')"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>