diff --git a/Block/Promotion/Pixel/Code.php b/Block/Promotion/Pixel/Code.php
new file mode 100755
index 00000000..92e9fee4
--- /dev/null
+++ b/Block/Promotion/Pixel/Code.php
@@ -0,0 +1,646 @@
+<?php
+/**
+ *
+ *  * BSD 3-Clause License
+ *  *
+ *  * Copyright (c) 2018, Affirm
+ *  * All rights reserved.
+ *  *
+ *  * Redistribution and use in source and binary forms, with or without
+ *  * modification, are permitted provided that the following conditions are met:
+ *  *
+ *  *  Redistributions of source code must retain the above copyright notice, this
+ *  *   list of conditions and the following disclaimer.
+ *  *
+ *  *  Redistributions in binary form must reproduce the above copyright notice,
+ *  *   this list of conditions and the following disclaimer in the documentation
+ *  *   and/or other materials provided with the distribution.
+ *  *
+ *  *  Neither the name of the copyright holder nor the names of its
+ *  *   contributors may be used to endorse or promote products derived from
+ *  *   this software without specific prior written permission.
+ *  *
+ *  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ *  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace Astound\Affirm\Block\Promotion\Pixel;
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\View\Element\Template;
+use Astound\Affirm\Model\Ui\ConfigProvider;
+use Astound\Affirm\Gateway\Helper\Util;
+use Astound\Affirm\Helper\Pixel;
+
+/**
+ * Class Code
+ *
+ * @package Astound\Affirm\Block\Promotion\Pixel
+ */
+class Code extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    public $storeManager;
+    
+    /**
+     * @var \Astound\Affirm\Helper\Pixel
+     */
+    public $affirmPixelHelper;
+    
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    public $coreRegistry;
+    
+    /**
+     * @var \Magento\Catalog\Helper\Data
+     */
+    public $catalogHelper;
+    
+    /**
+     * Tax config model
+     *
+     * @var \Magento\Tax\Model\Config
+     */
+    public $taxConfig;
+    
+    /**
+     * Tax display flag
+     *
+     * @var null|int
+     */
+    public $taxDisplayFlag = null;
+    
+    /**
+     * Tax catalog flag
+     *
+     * @var null|int
+     */
+    public $taxCatalogFlag = null;
+    
+    /**
+     * Store object
+     *
+     * @var null|\Magento\Store\Model\Store
+     */
+    public $store = null;
+    
+    /**
+     * Store ID
+     *
+     * @var null|int
+     */
+    public $storeId = null;
+    
+    /**
+     * Base currency code
+     *
+     * @var null|string
+     */
+    public $baseCurrencyCode = null;
+    
+    /**
+     * Current currency code
+     *
+     * @var null|string
+     */
+    public $currentCurrencyCode = null;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    public $checkoutSession;
+    
+    /**
+     * Constructor
+     *
+     * @param Template\Context $context
+     * @param ConfigProvider   $configProvider
+     * @param Pixel $affirmPixelHelper
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Catalog\Helper\Data $catalogHelper
+     * @param \Magento\Tax\Model\Config $taxConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        ConfigProvider $configProvider,
+        Pixel $affirmPixelHelper,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Catalog\Helper\Data $catalogHelper,
+        \Magento\Tax\Model\Config $taxConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+
+        array $data = []
+    ) {
+        $this->storeManager  = $context->getStoreManager();
+        $this->affirmPixelHelper = $affirmPixelHelper;
+        $this->coreRegistry  = $coreRegistry;
+        $this->catalogHelper = $catalogHelper;
+        $this->taxConfig     = $taxConfig;
+        $this->configProvider = $configProvider;
+        $this->checkoutSession = $checkoutSession;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Render GA tracking scripts
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        if (!$this->affirmPixelHelper->isTrackPixelEnabledConfig()) {
+            return '';
+        }
+
+        return parent::_toHtml();
+    }
+
+    /**
+     * Get options for
+     *
+     * @return string
+     */
+    public function getOptions()
+    {
+        $options = [];
+        $configProvider = $this->configProvider->getConfig();
+        if ($configProvider['payment'][ConfigProvider::CODE]) {
+            $config = $configProvider['payment'][ConfigProvider::CODE];
+            if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
+                $options['script'] = $config['script'];
+                $options['public_api_key'] = $config['apiKeyPublic'];
+            }
+        }
+        return json_encode($options);
+    }
+
+    /**
+     * Returns product data needed for dynamic ads tracking.
+     *
+     * @return array
+     */
+    public function getProductData()
+    {
+        $p = $this->coreRegistry->registry('current_product');
+
+        $data = array();
+        if($p) {
+            $data['name'] = $this->affirmPixelHelper->escapeSingleQuotes($p->getName());
+            $data['productId'] = $this->affirmPixelHelper->escapeSingleQuotes($p->getSku());
+            $data['price'] = Util::formatToCents($this->formatPrice($this->getProductPrice($p)));
+            $data['currency'] = $this->getCurrentCurrencyCode();
+        }
+        return $data;
+    }
+
+    /**
+     * Returns cart data needed for tracking.
+     *
+     * @return array
+     */
+    public function getCartData()
+    {
+        $data = array();
+        $items = $this->checkoutSession->getQuote()->getAllVisibleItems();
+        if($items) {
+            foreach ($items as $item) {
+                $productData = array();
+                $productData['productId'] = $this->affirmPixelHelper->escapeSingleQuotes($item->getSku());
+                $productData['name'] = $this->affirmPixelHelper->escapeSingleQuotes($item->getName());
+                $productData['price'] = Util::formatToCents($item->getPrice());
+                $productData['currency'] = $this->getCurrentCurrencyCode();
+                $productData['quantity'] = $item->getQty();
+                $data[] = $productData;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Returns quote data needed for checkout started tracking.
+     *
+     * @return array|null
+     */
+    public function getQuoteData()
+    {
+        $quote= $this->checkoutSession->getQuote();
+        $data = array();
+        if ($quote) {
+            $data['checkoutId'] = $quote->getId();
+            $data['currency'] = $quote->getQuoteCurrencyCode();
+            $data['total'] = Util::formatToCents($quote->getGrandTotal());
+        }
+        return $data;
+
+    }
+
+    /**
+     * Returns quote products data needed for checkout started tracking.
+     *
+     * @return array|null
+     */
+    public function getQuoteProductsData()
+    {
+        $quote= $this->checkoutSession->getQuote();
+        $data = array();
+        if ($quote) {
+            foreach ($quote->getAllVisibleItems() as $item) {
+                $productData = array();
+                $productData['productId'] = $this->affirmPixelHelper->escapeSingleQuotes($item->getSku());
+                $productData['name'] = $this->affirmPixelHelper->escapeSingleQuotes($item->getName());
+                $productData['price'] = Util::formatToCents($item->getPrice());
+                $productData['currency'] = $this->getCurrentCurrencyCode();
+                $productData['quantity'] = $item->getQty();
+                $data[] = $productData;
+            }
+        }
+        return $data;
+
+    }
+
+
+    /**
+     * Returns store object
+     *
+     * @return \Magento\Store\Model\Store
+     */
+    public function getStore()
+    {
+        if ($this->store === null) {
+            $this->store = $this->storeManager->getStore();
+        }
+        
+        return $this->store;
+    }
+    
+    /**
+     * Returns Store Id
+     *
+     * @return int
+     */
+    public function getStoreId()
+    {
+        if ($this->storeId === null) {
+            $this->storeId = $this->getStore()->getId();
+        }
+        
+        return $this->storeId;
+    }
+    
+    /**
+     * Returns base currency code
+     * (3 letter currency code like USD, GBP, EUR, etc.)
+     *
+     * @return string
+     */
+    public function getBaseCurrencyCode()
+    {
+        if ($this->baseCurrencyCode === null) {
+            $this->baseCurrencyCode = strtoupper(
+                $this->getStore()->getBaseCurrencyCode()
+            );
+        }
+        
+        return $this->baseCurrencyCode;
+    }
+    
+    /**
+     * Returns current currency code
+     * (3 letter currency code like USD, GBP, EUR, etc.)
+     *
+     * @return string
+     */
+    public function getCurrentCurrencyCode()
+    {
+        if ($this->currentCurrencyCode === null) {
+            $this->currentCurrencyCode = strtoupper(
+                $this->getStore()->getCurrentCurrencyCode()
+            );
+        }
+        
+        return $this->currentCurrencyCode;
+    }
+    
+    /**
+     * Returns flag based on "Stores > Cofiguration > Sales > Tax
+     * > Price Display Settings > Display Product Prices In Catalog"
+     * Returns 0 or 1 instead of 1, 2, 3.
+     *
+     * @return int
+     */
+    public function getDisplayTaxFlag()
+    {
+        if ($this->taxDisplayFlag === null) {
+            // Tax Display
+            // 1 - excluding tax
+            // 2 - including tax
+            // 3 - including and excluding tax
+            $flag = $this->taxConfig->getPriceDisplayType($this->getStoreId());
+            
+            // 0 means price excluding tax, 1 means price including tax
+            if ($flag == 1) {
+                $this->taxDisplayFlag = 0;
+            } else {
+                $this->taxDisplayFlag = 1;
+            }
+        }
+        
+        return $this->taxDisplayFlag;
+    }
+    
+    /**
+     * Returns Stores > Cofiguration > Sales > Tax > Calculation Settings
+     * > Catalog Prices configuration value
+     *
+     * @return int
+     */
+    public function getCatalogTaxFlag()
+    {
+        // Are catalog product prices with tax included or excluded?
+        if ($this->taxCatalogFlag === null) {
+            $this->taxCatalogFlag = (int) $this->affirmPixelHelper->getConfig(
+                'tax/calculation/price_includes_tax',
+                $this->getStoreId()
+            );
+        }
+        
+        // 0 means excluded, 1 means included
+        return $this->taxCatalogFlag;
+    }
+    
+    /**
+     * Returns product price.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return string
+     */
+    public function getProductPrice($product)
+    {
+        $price = 0.0;
+        
+        switch ($product->getTypeId()) {
+            case 'bundle':
+                $price =  $this->getBundleProductPrice($product);
+                break;
+            case 'configurable':
+                $price = $this->getConfigurableProductPrice($product);
+                break;
+            case 'grouped':
+                $price = $this->getGroupedProductPrice($product);
+                break;
+            default:
+                $price = $this->getFinalPrice($product);
+        }
+        
+        return $price;
+    }
+    
+    /**
+     * Returns bundle product price.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return string
+     */
+    public function getBundleProductPrice($product)
+    {
+        $includeTax = (bool) $this->getDisplayTaxFlag();
+        
+        return $this->getFinalPrice(
+            $product,
+            $product->getPriceModel()->getTotalPrices(
+                $product,
+                'min',
+                $includeTax,
+                1
+            )
+        );
+    }
+    
+    /**
+     * Returns configurable product price.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return string
+     */
+    public function getConfigurableProductPrice($product)
+    {
+        if ($product->getFinalPrice() === 0) {
+            $simpleCollection = $product->getTypeInstance()
+                ->getUsedProducts($product);
+            
+            foreach ($simpleCollection as $simpleProduct) {
+                if ($simpleProduct->getPrice() > 0) {
+                    return $this->getFinalPrice($simpleProduct);
+                }
+            }
+        }
+        
+        return $this->getFinalPrice($product);
+    }
+    
+    /**
+     * Returns grouped product price.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return string
+     */
+    public function getGroupedProductPrice($product)
+    {
+        $assocProducts = $product->getTypeInstance(true)
+            ->getAssociatedProductCollection($product)
+            ->addAttributeToSelect('price')
+            ->addAttributeToSelect('tax_class_id')
+            ->addAttributeToSelect('tax_percent');
+        
+        $minPrice = INF;
+        foreach ($assocProducts as $assocProduct) {
+            $minPrice = min($minPrice, $this->getFinalPrice($assocProduct));
+        }
+        
+        return $minPrice;
+    }
+    
+    /**
+     * Returns final price.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string $price
+     * @return string
+     */
+    public function getFinalPrice($product, $price = null)
+    {
+        if ($price === null) {
+            $price = $product->getFinalPrice();
+        }
+        
+        if ($price === null) {
+            $price = $product->getData('special_price');
+        }
+        
+        $productType = $product->getTypeId();
+        
+        // 1. Convert to current currency if needed
+        
+        // Convert price if base and current currency are not the same
+        // Except for configurable products they already have currency converted
+        if (($this->getBaseCurrencyCode() !== $this->getCurrentCurrencyCode())
+            && $productType != 'configurable'
+        ) {
+            // Convert to from base currency to current currency
+            $price = $this->getStore()->getBaseCurrency()
+                ->convert($price, $this->getCurrentCurrencyCode());
+        }
+        
+        // 2. Apply tax if needed
+        
+        // Simple, Virtual, Downloadable products price is without tax
+        // Grouped products have associated products without tax
+        // Bundle products price already have tax included/excluded
+        // Configurable products price already have tax included/excluded
+        if ($productType != 'configurable' && $productType != 'bundle') {
+            // If display tax flag is on and catalog tax flag is off
+            if ($this->getDisplayTaxFlag() && !$this->getCatalogTaxFlag()) {
+                $price = $this->catalogHelper->getTaxPrice(
+                    $product,
+                    $price,
+                    true,
+                    null,
+                    null,
+                    null,
+                    $this->getStoreId(),
+                    false,
+                    false
+                );
+            }
+        }
+        
+        // Case when catalog prices are with tax but display tax is set to
+        // to exclude tax. Applies for all products except for bundle
+        if ($productType != 'bundle') {
+            // If display tax flag is off and catalog tax flag is on
+            if (!$this->getDisplayTaxFlag() && $this->getCatalogTaxFlag()) {
+                $price = $this->catalogHelper->getTaxPrice(
+                    $product,
+                    $price,
+                    false,
+                    null,
+                    null,
+                    null,
+                    $this->getStoreId(),
+                    true,
+                    false
+                );
+            }
+        }
+        
+        return $price;
+    }
+    
+    /**
+     * Returns formated price.
+     *
+     * @param string $price
+     * @param string $currencyCode
+     * @return string
+     */
+    public function formatPrice($price, $currencyCode = '')
+    {
+        $formatedPrice = number_format($price, 2, '.', '');
+        
+        if ($currencyCode) {
+            return $formatedPrice . ' ' . $currencyCode;
+        } else {
+            return $formatedPrice;
+        }
+    }
+
+    /**
+     * Returns is pixel placement for search query enabled
+     *
+     * @return bool
+     */
+    public function isSearchTrackPixelEnabled()
+    {
+        return $this->affirmPixelHelper->isSearchTrackPixelEnabledConfig();
+    }
+
+    /**
+     * Returns is pixel placement for product list page enabled
+     *
+     * @return bool
+     */
+    public function isProductListTrackPixelEnabled()
+    {
+        return $this->affirmPixelHelper->isProductListTrackPixelEnabledConfig();
+    }
+
+    /**
+     * Returns is pixel placement for product page enabled
+     *
+     * @return bool
+     */
+    public function isProductViewTrackPixelEnabled()
+    {
+        return $this->affirmPixelHelper->isProductViewTrackPixelEnabledConfig();
+    }
+
+    /**
+     * Returns is pixel placement for add to cart action enabled
+     *
+     * @return bool
+     */
+    public function isAddCartTrackPixelEnabled()
+    {
+        return $this->affirmPixelHelper->isAddCartTrackPixelEnabledConfig();
+    }
+
+    /**
+     * Returns is pixel placement for checkout start action enabled
+     *
+     * @return bool
+     */
+    public function isAddChkStartTrackPixelEnabled()
+    {
+        return $this->affirmPixelHelper->isAddChkStartTrackPixelEnabledConfig();
+    }
+
+    /**
+     * Returns category data needed for tracking.
+     *
+     * @return array
+     */
+    public function getCategoryData()
+    {
+        $_category =  $this->coreRegistry->registry('current_category');
+        $data = array();
+        if ($_category) {
+            $data['categoryId'] = $_category->getId();
+            $data['categoryName'] = $_category->getName();
+        }
+        return $data;
+    }
+
+    /**
+     * get query string
+     *
+     * @return string
+     */
+    public function getQueryString()
+    {
+        return $this->getRequest()->getParam('q');
+    }
+}
diff --git a/Block/Promotion/Pixel/Confirm.php b/Block/Promotion/Pixel/Confirm.php
index b5724dcf..b8dbf46f 100644
--- a/Block/Promotion/Pixel/Confirm.php
+++ b/Block/Promotion/Pixel/Confirm.php
@@ -45,7 +45,7 @@
 /**
  * Class Confirm
  *
- * @package Astound\Affirm\Block\Promotion
+ * @package Astound\Affirm\Block\Pixel
  */
 class Confirm extends \Magento\Framework\View\Element\Template
 {
@@ -142,7 +142,7 @@ public function getOrdersTrackingCode()
      */
     protected function _toHtml()
     {
-        if (!$this->affirmPixelHelper->isAffirmAnalyticsAvailable()) {
+        if (!$this->affirmPixelHelper->isCheckoutSuccessPixelEnabledConfig()) {
             return '';
         }
 
@@ -163,7 +163,6 @@ public function getOptions()
             if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
                 $options['script'] = $config['script'];
                 $options['public_api_key'] = $config['apiKeyPublic'];
-                $options['sessionId'] = ($this->getCustomerSessionId())? $this->getCustomerSessionId() : '';
             }
         }
         return json_encode($options);
diff --git a/Helper/Pixel.php b/Helper/Pixel.php
index 5be48e20..9bd1d692 100644
--- a/Helper/Pixel.php
+++ b/Helper/Pixel.php
@@ -66,22 +66,110 @@ public function __construct(
         $this->affirmPaymentConfig = $configAffirm;
     }
 
+    public function getDateMicrotime()
+    {
+        $microtime = explode(' ', microtime());
+        $msec = $microtime[0];
+        $msecArray = explode('.', $msec);
+        $date = date('Y-m-d-H-i-s') . '-' . $msecArray[1];
+        return $date;
+    }
+
+    /**
+     * Returns is pixel enabled
+     *
+     * @return bool
+     */
+    public function isTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('enabled');
+    }
+
     /**
-     * Get pixel active status for confirm page
+     * Returns is pixel placement for search query enabled
      *
+     * @return bool
+     */
+    public function isSearchTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_search');
+    }
+
+    /**
+     * Returns is pixel placement for product list page enabled
+     *
+     * @return bool
+     */
+    public function isProductListTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_product_list');
+    }
+
+    /**
+     * Returns is pixel placement for product page enabled
+     *
+     * @return bool
+     */
+    public function isProductViewTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_product_view');
+    }
+
+    /**
+     * Returns is pixel placement for add to cart action enabled
+     *
+     * @return bool
+     */
+    public function isAddCartTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_cart');
+    }
+
+    /**
+     * Returns is pixel placement for checkout start action enabled
+     *
+     * @return bool
+     */
+    public function isAddChkStartTrackPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_checkout_start');
+    }
+
+
+    /**
+     * Returns is pixel placement for confirmation page enabled
+     *
+     * @return bool
+     */
+    public function isCheckoutSuccessPixelEnabledConfig()
+    {
+        return $this->affirmPaymentConfig->getPixelValue('add_checkout_success');
+    }
+
+    /**
+     * Add slashes to string and prepares string for javascript.
+     *
+     * @param string $str
      * @return string
      */
-    public function isAffirmAnalyticsAvailable()
+    public function escapeSingleQuotes($str)
     {
-        return $this->affirmPaymentConfig->getPixelValue('active_confirm');
+        return str_replace("'", "\'", $str);
     }
 
-    public function getDateMicrotime()
+    /**
+    * Based on provided configuration path returns configuration value.
+    *
+    * @param string $configPath
+    * @param string|int $scope
+    * @return string
+    */
+    public function getConfig($configPath, $scope = 'default')
     {
-        $microtime = explode(' ', microtime());
-        $msec = $microtime[0];
-        $msecArray = explode('.', $msec);
-        $date = date('Y-m-d-H-i-s') . '-' . $msecArray[1];
-        return $date;
+        return $this->scopeConfig->getValue(
+            $configPath,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $scope
+        );
     }
 }
diff --git a/composer.json b/composer.json
index 61dadc20..639bdd77 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "affirm/magento2",
     "description": "Affirm's extension for the Magento 2 https://www.affirm.com/",
     "type": "magento2-module",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": [
         "BSD-3-Clause"
     ],
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 77f8e71c..a5dc0e3e 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -287,9 +287,40 @@
             </group>
             <group id="affirm_pixel" translate="label" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Enhanced Analytics</label>
-                <field id="active_confirm" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Enable pixel for confirmation page</label>
+                <field id="enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Enable Affirm pixel</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable affirm tracking pixels. In addition to enabling this config, please do enable pixel for specific actions using config options listed below.</comment>
+                </field>
+                <field id="add_cart" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Add to Cart</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable add to cart tracking</comment>
+                </field>
+                <field id="add_search" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Search</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable search tracking</comment>
+                </field>
+                <field id="add_product_view" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Product</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable product tracking</comment>
+                </field>
+                <field id="add_product_list" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Product List</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable product list tracking</comment>
+                </field>
+                <field id="add_checkout_start" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Checkout Start</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable checkout start tracking</comment>
+                </field>
+                <field id="add_checkout_success" translate="label" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Checkout Success</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable checkout success tracking</comment>
                 </field>
             </group>
         </section>
diff --git a/etc/module.xml b/etc/module.xml
index 3816f17c..01d7e127 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,7 +10,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Astound_Affirm" setup_version="2.1.0">
+    <module name="Astound_Affirm" setup_version="2.1.1">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/view/frontend/layout/catalog_category_view.xml b/view/frontend/layout/catalog_category_view.xml
index 0c2c648b..80ab8b86 100644
--- a/view/frontend/layout/catalog_category_view.xml
+++ b/view/frontend/layout/catalog_category_view.xml
@@ -51,5 +51,13 @@
                 </arguments>
             </block>
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_category"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   as="affirm_pixel_javascript_code"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index 89fbd7d2..f3bd9c2e 100644
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -69,5 +69,13 @@
                 </arguments>
             </block>
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_product"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   as="affirm_pixel_javascript_code"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/catalog_product_view_type_bundle.xml b/view/frontend/layout/catalog_product_view_type_bundle.xml
index a70d797c..8e108ba2 100644
--- a/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -27,5 +27,12 @@
                 </arguments>
             </block>
         </referenceBlock>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_product_bundle"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/catalogsearch_advanced_result.xml b/view/frontend/layout/catalogsearch_advanced_result.xml
new file mode 100755
index 00000000..b3a5c70a
--- /dev/null
+++ b/view/frontend/layout/catalogsearch_advanced_result.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+  ~ /*
+  ~  * BSD 3-Clause License
+  ~  *
+  ~  * Copyright (c) 2018, Affirm
+  ~  * All rights reserved.
+  ~  *
+  ~  * Redistribution and use in source and binary forms, with or without
+  ~  * modification, are permitted provided that the following conditions are met:
+  ~  *
+  ~  *  Redistributions of source code must retain the above copyright notice, this
+  ~  *   list of conditions and the following disclaimer.
+  ~  *
+  ~  *  Redistributions in binary form must reproduce the above copyright notice,
+  ~  *   this list of conditions and the following disclaimer in the documentation
+  ~  *   and/or other materials provided with the distribution.
+  ~  *
+  ~  *  Neither the name of the copyright holder nor the names of its
+  ~  *   contributors may be used to endorse or promote products derived from
+  ~  *   this software without specific prior written permission.
+  ~  *
+  ~  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  ~  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  ~  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  ~  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  ~  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  ~  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  ~  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  ~  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  ~  */
+  -->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_catalogsearch"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/catalogsearch_result_index.xml b/view/frontend/layout/catalogsearch_result_index.xml
new file mode 100755
index 00000000..d2ecdfeb
--- /dev/null
+++ b/view/frontend/layout/catalogsearch_result_index.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+  ~ /*
+  ~  * BSD 3-Clause License
+  ~  *
+  ~  * Copyright (c) 2018, Affirm
+  ~  * All rights reserved.
+  ~  *
+  ~  * Redistribution and use in source and binary forms, with or without
+  ~  * modification, are permitted provided that the following conditions are met:
+  ~  *
+  ~  *  Redistributions of source code must retain the above copyright notice, this
+  ~  *   list of conditions and the following disclaimer.
+  ~  *
+  ~  *  Redistributions in binary form must reproduce the above copyright notice,
+  ~  *   this list of conditions and the following disclaimer in the documentation
+  ~  *   and/or other materials provided with the distribution.
+  ~  *
+  ~  *  Neither the name of the copyright holder nor the names of its
+  ~  *   contributors may be used to endorse or promote products derived from
+  ~  *   this software without specific prior written permission.
+  ~  *
+  ~  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  ~  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  ~  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  ~  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  ~  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  ~  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  ~  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  ~  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  ~  */
+  -->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_catalog_search"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
index 945e42ae..568c6706 100644
--- a/view/frontend/layout/checkout_cart_index.xml
+++ b/view/frontend/layout/checkout_cart_index.xml
@@ -53,5 +53,12 @@
                 </arguments>
             </block>
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Code"
+                   name="affirm_pixel_code_category"
+                   template="Astound_Affirm::pixel/code.phtml"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
index fdfaeed0..4e57d108 100644
--- a/view/frontend/layout/checkout_onepage_success.xml
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -34,8 +34,13 @@
   -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="order.success.additional.info">
-            <block class="Astound\Affirm\Block\Promotion\Pixel\Confirm" name="affirm_pixel_javascript" as="affirm_pixel_javascript" template="Astound_Affirm::pixel/confirm.phtml"/>
+        <referenceContainer name="before.body.end">
+            <block class="Astound\Affirm\Block\Promotion\Pixel\Confirm"
+                   name="affirm_pixel_code_confirm"
+                   template="Astound_Affirm::pixel/confirm.phtml"
+                   as="affirm_pixel_javascript_code"
+                   after="-"
+                   ifconfig="affirm/affirm_pixel/enabled" />
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 59fb81e4..b19d7700 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -19,12 +19,12 @@ var config = {
     map: {
         '*': {
             'synchPost': 'Astound_Affirm/js/action/send-request',
+            'affirmPixel': 'Astound_Affirm/js/affirmPixel',
             'affirmWidget': 'Astound_Affirm/js/affirmWidget',
             'aslowasPDP': 'Astound_Affirm/js/aslowasPDP',
             'aslowasPLP': 'Astound_Affirm/js/aslowasPLP',
             'aslowasCC': 'Astound_Affirm/js/aslowasCC',
-            'aslowasMC': 'Astound_Affirm/js/aslowasMC',
-            'affirmPixel': 'Astound_Affirm/js/affirmPixel'
+            'aslowasMC': 'Astound_Affirm/js/aslowasMC'
         }
     }
 };
diff --git a/view/frontend/templates/pixel/code.phtml b/view/frontend/templates/pixel/code.phtml
new file mode 100755
index 00000000..2dc3b89b
--- /dev/null
+++ b/view/frontend/templates/pixel/code.phtml
@@ -0,0 +1,182 @@
+<?php
+/**
+ *
+ *  * BSD 3-Clause License
+ *  *
+ *  * Copyright (c) 2018, Affirm
+ *  * All rights reserved.
+ *  *
+ *  * Redistribution and use in source and binary forms, with or without
+ *  * modification, are permitted provided that the following conditions are met:
+ *  *
+ *  *  Redistributions of source code must retain the above copyright notice, this
+ *  *   list of conditions and the following disclaimer.
+ *  *
+ *  *  Redistributions in binary form must reproduce the above copyright notice,
+ *  *   this list of conditions and the following disclaimer in the documentation
+ *  *   and/or other materials provided with the distribution.
+ *  *
+ *  *  Neither the name of the copyright holder nor the names of its
+ *  *   contributors may be used to endorse or promote products derived from
+ *  *   this software without specific prior written permission.
+ *  *
+ *  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ *  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+?>
+
+<?php
+
+$options = $block->getOptions();
+
+$enableSearchTrack = $block->isSearchTrackPixelEnabled();
+$enableProductListTrack = $block->isProductListTrackPixelEnabled();
+$enableProductViewTrack = $block->isProductViewTrackPixelEnabled();
+$enableAddCartTrack = $block->isAddCartTrackPixelEnabled();
+$enableAddChkStartTrack = $block->isAddChkStartTrackPixelEnabled();
+
+$action   = $this->getRequest()->getFullActionName();
+
+?>
+<!-- BEGIN AFFIRM ANALYTICS CODE -->
+<script type="text/x-magento-init">
+{"*": {
+        "affirmPixel": <?php echo $options ?>
+    }
+}
+</script>
+
+<script>
+    require(['jquery', 'jquery/ui', 'affirmPixel'],function($, affirmPixel){
+        $(window).load(function () {
+            if (typeof affirm != "undefined") {
+                <?php
+
+                // Search
+                if (($action == 'catalogsearch_result_index' || $action == 'catalogsearch_advanced') && ($enableSearchTrack)) {
+                    $queryString = $this->getQueryString();
+                    if($queryString) {
+                        $queryString = isset($queryString) ? urlencode($queryString) : '';
+                        echo "affirm.analytics.trackProductsSearched(\"" . $queryString . "\");";
+                    }
+                }
+                //Product List Or Category Page Or Search results viewed
+                if (($action == 'catalog_category_view' || $action == 'catalogsearch_result_index') && $enableProductListTrack ) {
+                    $productListData = $this->getCategoryData();
+                    if($productListData) {
+                        $categoryId = isset($productListData['categoryId']) ? $productListData['categoryId'] : '';
+                        $categoryName = isset($productListData['categoryName']) ? $productListData['categoryName'] : '';
+                        echo "affirm.analytics.trackProductListViewed(
+                    {
+                        \"listId\":\"" . $categoryId . "\", 
+                        \"category\":\"" . $categoryName . "\"
+                    }, [{}]);";
+                    }
+                }
+
+                // Product detail view
+                if ($action == 'catalog_product_view' && $enableProductViewTrack ) {
+                    $productData = $this->getProductData();
+                    if($productData) {
+                        $name = isset($productData['name']) ? $productData['name'] : '';
+                        $productId = isset($productData['productId']) ? $productData['productId'] : '';
+                        $currency = isset($productData['currency']) ? $productData['currency'] : '';
+                        $price = isset($productData['price']) ? $productData['price'] : '';
+                        echo "affirm.analytics.trackProductViewed(
+                            {
+                                \"name\":\"" . $name . "\", 
+                                \"productId\":\"" . $productId . "\",
+                                \"currency\":\"" . $currency . "\",
+                                \"price\":\"" . $price . "\"
+                            });";
+                        if($enableAddCartTrack){
+                            ?>
+                            //Add Pixel Event to the button's click handler
+                            if (typeof jQuery != 'undefined') {
+                                jQuery('#product-addtocart-button').click(function () {
+                                    affirm.analytics.trackProductAdded({
+                                        name: '<?php echo $name ?>',
+                                        productId: '<?php echo $productId ?>',
+                                        currency: '<?php echo $currency ?>',
+                                        price: <?php echo $price ?>
+                                    });
+                                });
+                            }
+                            <?php
+                        }
+                    }
+                }
+
+                // Cart viewed
+                if ($action == 'checkout_cart_index' && ($enableAddCartTrack)) {
+                    //Cart viewed
+                    $cartProductsData = $this->getCartData();
+                    if($cartProductsData) {
+                        echo "affirm.analytics.trackCartViewed([";
+                        foreach ($cartProductsData as $cartProduct) {
+                            $name = isset($cartProduct['name']) ? $cartProduct['name'] : '';
+                            $productId = isset($cartProduct['productId']) ? $cartProduct['productId'] : '';
+                            $currency = isset($cartProduct['currency']) ? $cartProduct['currency'] : '';
+                            $price = isset($cartProduct['price']) ? $cartProduct['price'] : '';
+                            $quantity = isset($cartProduct['quantity']) ? $cartProduct['quantity'] : '';
+                            echo "{
+                            \"name\":\"" . $name . "\", 
+                            \"productId\":\"" . $productId . "\",
+                            \"currency\":\"" . $currency . "\",
+                            \"price\":\"" . $price . "\",
+                            \"quantity\":\"" . $quantity . "\"
+                            },";
+                        }
+                        echo "], {});";
+                    }
+
+                }
+
+                if (($action == 'checkout_index_index' || $action == 'onepagecheckout_index_index' || $action == 'onestepcheckout_index_index' || $action == 'opc_index_index') && ($enableAddChkStartTrack)) {
+                    $quoteData = $this->getQuoteData();
+                    if($quoteData) {
+                        $checkoutId = isset($quoteData['checkoutId']) ? $quoteData['checkoutId'] : '';
+                        $orderId = isset($quoteData['orderId']) ? $quoteData['orderId'] : '';
+                        $currency = isset($quoteData['currency']) ? $quoteData['currency'] : '';
+                        $total = isset($quoteData['total']) ? $quoteData['total'] : '';
+                        $paymentMethod = isset($quoteData['paymentMethod']) ? $quoteData['paymentMethod'] : '';
+                        echo "affirm.analytics.trackCheckoutStarted({
+                            \"checkoutId\":\"" . $checkoutId . "\", 
+                            \"currency\":\"" . $currency . "\",
+                            \"total\":\"" . $total . "\",
+                        },[";
+                        $quoteProductsData = $this->getQuoteProductsData();
+                        if($quoteProductsData) {
+                            foreach ($quoteProductsData as $cartProduct) {
+                                $name = isset($cartProduct['name']) ? $cartProduct['name'] : '';
+                                $productId = isset($cartProduct['productId']) ? $cartProduct['productId'] : '';
+                                $currency = isset($cartProduct['currency']) ? $cartProduct['currency'] : '';
+                                $price = isset($cartProduct['price']) ? $cartProduct['price'] : '';
+                                $quantity = isset($cartProduct['quantity']) ? $cartProduct['quantity'] : '';
+                                echo "{
+                                    \"name\":\"" . $name . "\", 
+                                    \"productId\":\"" . $productId . "\",
+                                    \"currency\":\"" . $currency . "\",
+                                    \"price\":\"" . $price . "\",
+                                    \"quantity\":\"" . $quantity . "\"
+                                    },";
+                                }
+                        }
+                        echo "]);";
+                    }                }
+
+                ?>
+            };
+        });
+    });
+</script>
+<!-- END AFFIRM ANALYTICS CODE -->
diff --git a/view/frontend/templates/pixel/confirm.phtml b/view/frontend/templates/pixel/confirm.phtml
index e2a0f703..6c3e209d 100644
--- a/view/frontend/templates/pixel/confirm.phtml
+++ b/view/frontend/templates/pixel/confirm.phtml
@@ -35,20 +35,28 @@
 ?>
 <?php
 $options = $block->getOptions();
+$pixelCode = $this->getOrdersTrackingCode();
+
+$action   = $this->getRequest()->getFullActionName();
+
 ?>
 
 <!-- BEGIN AFFIRM ANALYTICS CODE -->
 <script type="text/x-magento-init">
 {"*": {
-        "Astound_Affirm/js/affirmPixel": <?php echo $options ?>
+        "affirmPixel": <?php echo $options ?>
     }
 }
 </script>
 <script>
-    require(['jquery', 'affirmPixel'],function($){
-        $(document).ready(function(){
+    require(['jquery', 'jquery/ui', 'affirmPixel'],function($, affirmPixel){
+        $(window).load(function () {
             if (typeof affirm != "undefined") {
-                <?php echo $this->getOrdersTrackingCode(); ?>
+                <?php
+                if ($action == 'checkout_onepage_success') {
+                    echo $pixelCode;
+                }
+                ?>
             }
         });
     });
diff --git a/view/frontend/templates/promotion/bml.phtml b/view/frontend/templates/promotion/bml.phtml
index 4c9c002f..0cc1f204 100644
--- a/view/frontend/templates/promotion/bml.phtml
+++ b/view/frontend/templates/promotion/bml.phtml
@@ -49,4 +49,4 @@
             </a>
         </div>';
 ?>
-<?php echo $this->getEndContainerTag(); ?>
+<?php echo $this->getEndContainerTag(); ?>
\ No newline at end of file
diff --git a/view/frontend/web/js/affirmPixel.js b/view/frontend/web/js/affirmPixel.js
index ec2d9838..9b76f066 100644
--- a/view/frontend/web/js/affirmPixel.js
+++ b/view/frontend/web/js/affirmPixel.js
@@ -35,22 +35,21 @@
 /*jshint jquery:true*/
 define([
     "jquery",
-    "Astound_Affirm/js/model/global",
+    "Astound_Affirm/js/model/aslowas",
     "jquery/ui"
-], function ($, global) {
-
+], function ($, aslowas) {
     "use strict"
 
     var self;
     $.widget('mage.affirmPixel', {
 
         /**
-         * Widget options
+         *  options
          */
         options: {},
 
         /**
-         * Create affirm widget
+         * Create affirm pixel
          *
          * @private
          */
@@ -58,11 +57,10 @@ define([
         _create: function() {
             self = this;
             if (typeof affirm == "undefined") {
-                $.when(global.loadScript(self.options)).done(function() {
-
+                $.when(aslowas.loadScript(self.options)).done(function() {
+                    console.log('Affirm js loaded');
                 });
             }
-
         },
 
     });
diff --git a/view/frontend/web/js/model/global.js b/view/frontend/web/js/model/global.js
index 7d1464a1..0e58dce3 100644
--- a/view/frontend/web/js/model/global.js
+++ b/view/frontend/web/js/model/global.js
@@ -35,7 +35,8 @@
 /*global alert*/
 define([
     "jquery",
-    "mage/translate"
+    "mage/translate",
+    "jquery/ui"
 ],
     function ($, $t) {
         'use strict';
@@ -53,11 +54,9 @@ define([
                 "use strict";
                 var pubKey = options.public_api_key,
                     script = options.script,
-                    sessId = options.sessionId,
                     _affirm_config = {
                         public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
                         script: script,
-                        sessionId: sessId
                     };
                 (function (l, g, m, e, a, f, b) {
                     var d, c = l[m] || {},