diff --git a/layout/blank-layout.liquid b/layout/blank-layout.liquid
index e3305c9..cdcfea4 100644
--- a/layout/blank-layout.liquid
+++ b/layout/blank-layout.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
 <head>
diff --git a/layout/old-layout.liquid b/layout/old-layout.liquid
index 68d7ff3..c519110 100644
--- a/layout/old-layout.liquid
+++ b/layout/old-layout.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
 <head>
diff --git a/layout/password.liquid b/layout/password.liquid
index aa5a207..001abd0 100644
--- a/layout/password.liquid
+++ b/layout/password.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js full-height" lang="{{ request.locale.iso_code }}">
   <head>
diff --git a/layout/product.liquid b/layout/product.liquid
index 1cccb14..78da6a5 100644
--- a/layout/product.liquid
+++ b/layout/product.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
 <head>
diff --git a/layout/test-theme.liquid b/layout/test-theme.liquid
index 12908c7..31d69ca 100644
--- a/layout/test-theme.liquid
+++ b/layout/test-theme.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
 <head>
diff --git a/layout/theme.liquid b/layout/theme.liquid
index 8937f6b..3c7d2a3 100644
--- a/layout/theme.liquid
+++ b/layout/theme.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
   <head>
diff --git a/layout/theme.maintenance.liquid b/layout/theme.maintenance.liquid
index 3cc8803..565615b 100644
--- a/layout/theme.maintenance.liquid
+++ b/layout/theme.maintenance.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 <!doctype html>
 <html class="no-js" lang="{{ request.locale.iso_code }}">
   <head>
diff --git a/layout/theme.shogun.landing.liquid b/layout/theme.shogun.landing.liquid
index 02899bb..e07893e 100644
--- a/layout/theme.shogun.landing.liquid
+++ b/layout/theme.shogun.landing.liquid
@@ -1,3 +1,4 @@
+{% include 'shogun-content-handler' %}
 {% comment %}
 Auto-generated by Shogun.
 This file can be re-written at any time.
@@ -85,72 +86,6 @@ This file can be re-written at any time.
   {{ content_for_layout }}
   
   <script>
-      const Marquee = () => {
-        const elements = document.querySelectorAll('.marquee')
-        const lastScrollPos = 0
-        let speed = 3
-        let timer
-
-        elements.forEach(function (el) {
-          const marqueeWrapper = el.parentNode;
-          const container = el.querySelector('.inner')
-          const content = el.querySelector('.inner > *')
-          const style = window.getComputedStyle(el.querySelector('.inner > p'));
-
-          const elWidth = container.offsetWidth;
-
-          const clone = content.cloneNode(true)
-          container.appendChild(clone)
-
-          let progress = 1
-          let isPlaying = false;
-          function loop () {
-            progress = progress - speed
-            if (progress <= elWidth * -1) {
-              progress = 0
-            }
-
-            container.style.transform = 'translateX(' + progress + 'px)'
-            container.style.transform += 'skewX(' + speed * 0.4 + 'deg)'
-            // window.requestAnimationFrame(loop)
-            if (isPlaying === true) requestAnimationFrame(loop);
-          }
-
-          marqueeWrapper.addEventListener('mouseenter', function () {
-            isPlaying = true;
-            loop();
-          });
-          marqueeWrapper.addEventListener('mouseleave', function () {
-            isPlaying = false;
-            loop();
-          });
-
-          loop()
-        })
-
-        //window.addEventListener('scroll', function () {
-          //const maxScrollValue = 12
-          //const newScrollPos = window.scrollY
-          //let scrollValue = newScrollPos - lastScrollPos
-          //if (scrollValue > maxScrollValue) scrollValue = maxScrollValue
-          //else if (scrollValue < -maxScrollValue) scrollValue = -maxScrollValue
-          //speed = 0
-          //clearTimeout(timer)
-          //timer = setTimeout(handleSpeedClear, 10)
-        //})
-
-        //function handleSpeedClear () {
-          //speed = 2
-        //}
-      }
-
-      window.addEventListener('load', () => {
-        Marquee();
-      });
-
-      // Marquee()
-    </script>
-<script>
       
       
       window.shopUrl = '{{ request.origin }}';
diff --git a/sections/shogun-optimizer.liquid b/sections/shogun-optimizer.liquid
new file mode 100644
index 0000000..308a38f
--- /dev/null
+++ b/sections/shogun-optimizer.liquid
@@ -0,0 +1,20 @@
+{% comment %}
+Auto-generated by Shogun.
+This file can be re-written at any time.
+{% endcomment %}
+
+{% if article %}
+  {% assign content = article %}
+{% elsif page %}
+  {% assign content = page %}
+{% elsif product %}
+  {% assign content = product %}
+{% elsif collection %}
+  {% assign content = collection %}
+{% endif %}
+{{content.metafields.shogun.optimizer}}
+{% schema %}
+  {
+    "name": "Shogun Optimizer"
+  }
+{% endschema %}
diff --git a/snippets/shogun-content-handler.liquid b/snippets/shogun-content-handler.liquid
new file mode 100644
index 0000000..0c81e7c
--- /dev/null
+++ b/snippets/shogun-content-handler.liquid
@@ -0,0 +1,62 @@
+{% comment %}
+Auto-generated by Shogun.
+This file can be re-written at any time.
+{% endcomment %}
+
+{% assign template_suffix = template.suffix %}
+
+{% if article %}
+  {% assign content = article %}
+{% elsif page %}
+  {% assign content = page %}
+{% elsif product %}
+  {% assign content = product %}
+{% elsif collection %}
+  {% assign content = collection %}
+
+{% endif %}
+
+{% capture content_for_header %}
+  {{ content_for_header }}
+  {% render 'shogun-products', content: content %}
+{% endcapture %}
+
+{% if content.metafields.shogun.json_template_snippets %}
+  {% capture content_for_header %}
+    {{ content_for_header }}
+    {{ content.metafields.shogun.json_template_snippets.value['head'][template_suffix] }}
+  {% endcapture %}
+
+  {% capture content_for_body %}
+    {{ content_for_layout }}
+    {{ content.metafields.shogun.json_template_snippets.value['body'][template_suffix] }}
+  {% endcapture %}
+{% endif %}
+
+{% if content.metafields.shogun.json_template_html_wrapper %}
+  {% assign json_template_config = content.metafields.shogun.json_template_html_wrapper.value %}
+  {% capture content_for_layout %}
+    {{
+        json_template_config.html
+        | replace: json_template_config.content_for_layout_placeholder, content_for_layout
+        | replace: json_template_config.page_variant_id_placeholder, json_template_config.template_suffix_to_variant_id_map[template_suffix]
+    }}
+  {% endcapture %}
+{% endif %}
+
+{% if content.metafields.shogun.json_template_optimizer %}
+     {% capture content_for_header %}
+        <template id="shogun-variant-head">
+          {{ content_for_header }}
+        </template>
+        {{ content.metafields.shogun.json_template_optimizer.value['head'] }}
+     {% endcapture %}
+
+     {% capture content_for_layout %}
+        <template id="shogun-variant-body">
+          {{ content_for_layout }}
+        </template>
+        {{ content.metafields.shogun.json_template_optimizer.value['body'] }}
+     {% endcapture %}
+{% endif %}
+
diff --git a/templates/article.collaborations.json b/templates/article.collaborations.json
index 6213cfd..998c489 100644
--- a/templates/article.collaborations.json
+++ b/templates/article.collaborations.json
@@ -1,3 +1,12 @@
+/*
+* ------------------------------------------------------------
+* IMPORTANT: The contents of this file are auto-generated.
+*
+* This file may be updated by the Shopify admin theme editor
+* or related systems. Please exercise caution as any changes
+* made to this file may be overwritten.
+* ------------------------------------------------------------
+*/
 {
   "sections": {
     "main": {
@@ -100,11 +109,17 @@
       "type": "shogun-helper",
       "settings": {
       }
+    },
+    "shogun-optimizer": {
+      "type": "shogun-optimizer",
+      "settings": {
+      }
     }
   },
   "order": [
     "shogun-helper",
     "main",
-    "featured-stories"
+    "featured-stories",
+    "shogun-optimizer"
   ]
 }
diff --git a/templates/article.shogun.custom.liquid b/templates/article.shogun.custom.liquid
new file mode 100644
index 0000000..7e3e2c7
--- /dev/null
+++ b/templates/article.shogun.custom.liquid
@@ -0,0 +1,7 @@
+{% comment %}
+Auto-generated by Shogun.
+This file can be re-written at any time.
+{% endcomment %}
+
+{% render 'shogun-products', content: page %}
+{{ article.content }}
diff --git a/templates/article.test.json b/templates/article.test.json
index 2519f84..3ee34e5 100644
--- a/templates/article.test.json
+++ b/templates/article.test.json
@@ -1,3 +1,12 @@
+/*
+* ------------------------------------------------------------
+* IMPORTANT: The contents of this file are auto-generated.
+*
+* This file may be updated by the Shopify admin theme editor
+* or related systems. Please exercise caution as any changes
+* made to this file may be overwritten.
+* ------------------------------------------------------------
+*/
 {
   "sections": {
     "main": {
@@ -45,11 +54,17 @@
       "type": "shogun-helper",
       "settings": {
       }
+    },
+    "shogun-optimizer": {
+      "type": "shogun-optimizer",
+      "settings": {
+      }
     }
   },
   "order": [
     "shogun-helper",
     "main",
-    "featured-stories"
+    "featured-stories",
+    "shogun-optimizer"
   ]
 }
diff --git a/templates/collection.shogun.custom.liquid b/templates/collection.shogun.custom.liquid
new file mode 100644
index 0000000..84dd19a
--- /dev/null
+++ b/templates/collection.shogun.custom.liquid
@@ -0,0 +1,6 @@
+{% comment %}
+Auto-generated by Shogun.
+This file can be re-written at any time.
+{% endcomment %}
+
+{{ collection.description }}
diff --git a/templates/page.shogun.default.liquid b/templates/page.shogun.default.liquid
index 26c30ea..77515da 100644
--- a/templates/page.shogun.default.liquid
+++ b/templates/page.shogun.default.liquid
@@ -6,3 +6,4 @@ This file can be re-written at any time.
 {% render 'shogun-products', content: page %}
 <div class="shg-clearfix"></div>
 {{ page.content }}
+{{ page.metafields.shogun.optimizer }}
diff --git a/templates/page.shogun.landing.liquid b/templates/page.shogun.landing.liquid
index 31765a9..0b28930 100644
--- a/templates/page.shogun.landing.liquid
+++ b/templates/page.shogun.landing.liquid
@@ -6,3 +6,4 @@ This file can be re-written at any time.
 {% render 'shogun-products', content: page %}
 {% layout 'theme.shogun.landing' %}
 {{ page.content }}
+{{ page.metafields.shogun.optimizer }}
diff --git a/templates/product.shogun.custom.liquid b/templates/product.shogun.custom.liquid
index 8c27604..9c641f3 100644
--- a/templates/product.shogun.custom.liquid
+++ b/templates/product.shogun.custom.liquid
@@ -5,3 +5,4 @@ This file can be re-written at any time.
 
 {% render 'shogun-products', content: product %}
 {{product.metafields.shogun.main}}
+{{ product.metafields.shogun.optimizer }}
