diff --git a/config/matrix-extended.php b/config/matrix-extended.php
index 0fbbce5..c8d8492 100644
--- a/config/matrix-extended.php
+++ b/config/matrix-extended.php
@@ -20,7 +20,7 @@
                 ],
                 [
                     'label' => \Craft::t('app', 'Layout'),
-                    'types' => ['twoColumns', 'container'],
+                    'types' => ['codeEmbed', 'twoColumns', 'container'],
                 ]
             ],
         ],
@@ -44,7 +44,11 @@
                 ],
                 [
                     'label' => \Craft::t('app', 'Components'),
-                    'types' => ['infoBox', 'cards', 'iconCards', 'statusCards', 'stackedCards', 'statsBox', 'checklist', 'accordion', 'imageContent', 'twoColumns'],
+                    'types' => ['infoBox', 'cards', 'iconCards', 'statusCards', 'stackedCards', 'statsBox', 'checklist', 'accordion', 'imageContent'],
+                ],
+                [
+                    'label' => \Craft::t('app', 'Layout'),
+                    'types' => ['codeEmbed', 'twoColumns'],
                 ]
             ],
         ]
diff --git a/config/project/entryTypes/codeEmbed--1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0.yaml b/config/project/entryTypes/codeEmbed--1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0.yaml
new file mode 100644
index 0000000..8f10647
--- /dev/null
+++ b/config/project/entryTypes/codeEmbed--1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0.yaml
@@ -0,0 +1,491 @@
+color: null
+fieldLayouts:
+  2ac97564-35d2-4409-b037-0ea36ace2585:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            includeInCards: false
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            providesThumbs: false
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 3bf72c32-d8b9-4b0b-a0f7-e283d8b636d9
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: c0909bba-5350-4f48-875b-48151f1f9f7c # Script Files
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 063f251a-5288-4437-afe2-854287a0f9b1
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 7afc8aef-c2ce-4275-ab1d-9a25238e9304 # Javascript Code
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: e76dcec0-cb12-49b9-bbf3-e848d4e3cd31
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 910dab4f-1758-4717-b8f9-e8b63a73f3de # HTML Code
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 20c2e1b7-b9ff-4b12-bbb1-6dd49d3f9f6e
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: cd89e303-53b3-4be0-a6f6-5977f0b729d3
+        userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: 5d2385da-c451-4d15-a8dc-9bf204cfb717 # Eyebrow
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: ef629381-13d3-4848-8ae9-64aa32d27cdb
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 08f0c8e2-e9c0-426a-aab3-861fbf413a1f # Heading
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 606c677f-8245-4fd7-88ec-4e6553a29e8f
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 28f860da-7e14-4288-a55f-bce3b2856d85 # Text
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: c5cc4686-7719-40ef-ac4c-d8b6bed2cd73
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: f3d1f10a-2e4d-40dc-9dc4-d6aea55b51d7 # Buttons
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 1b58383b-1cf7-4f35-8413-662d924ce866
+            userCondition: null
+            warning: null
+            width: 100
+        name: Auxiliary
+        uid: 597d94f8-967d-43cc-ac38-757a29c111ff
+        userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: 21102308-0ca8-4b67-8663-daef265f4c60 # Animation?
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 67f7e93d-926d-4655-afa0-f541001d32e8
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            type: craft\fieldlayoutelements\HorizontalRule
+            uid: 1dc14c4e-4acc-4ff6-91dd-3a6dbcb39fb1
+            userCondition: null
+          -
+            elementCondition: null
+            fieldUid: 3b2d250a-efd7-4394-9e59-a1ae3b9d5292 # Animation Style
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: ba50e7ef-2424-47d0-b806-efe1ea4400a1
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 8df78e11-4ebe-4815-a6a8-a9a62e77b6d6 # Animation Easing
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: a98fb9f9-1af7-4aa1-ae32-c49152cb2c09
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: e0e47b5e-62b4-4b02-aeca-99868e8625d9 # Animation Duration
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 56aad35c-0568-467f-80e6-071c99f55689
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 0e13a17a-1829-4ccb-a64f-c39b6d62af82 # Animation Offset
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 8e629994-0ba6-4f92-a82b-89c7bef7b755
+            userCondition: null
+            warning: null
+            width: 50
+        name: Animation
+        uid: ec16bc0c-ca75-41b0-ab0f-d096258ed150
+        userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            heading: 'Block Settings'
+            type: craft\fieldlayoutelements\Heading
+            uid: 37f89d52-7341-40bd-ae7d-1845caf65cb6
+            userCondition: null
+          -
+            elementCondition: null
+            fieldUid: aeac151d-d4a9-4733-9c2f-c8a1eac9a41b # Content Width
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 1247e3c0-1bff-4868-960c-b030aef0fc12
+            userCondition: null
+            warning: null
+            width: 75
+          -
+            elementCondition: null
+            fieldUid: c54b7104-c058-41f4-ac16-278920cf8062 # Container Size
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 94f857f4-8b59-445c-a8de-3784413c208e
+            userCondition: null
+            warning: null
+            width: 25
+          -
+            elementCondition: null
+            fieldUid: 6065b222-611d-42ce-a1de-85a02891694c # Background Color
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 168cef59-d023-4016-96d7-ff568d5c1a9f
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: f36b49ea-9938-42fb-9803-9772a378f173 # Overlay Opacity
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 4e208491-c473-4623-a7c8-d3d5c1e566ef
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            heading: 'Content Settings'
+            type: craft\fieldlayoutelements\Heading
+            uid: a753c0d1-8650-4e43-83b6-c9ae74930ceb
+            userCondition: null
+          -
+            elementCondition: null
+            fieldUid: cfc164dd-7161-4a3d-9407-1080228e7455 # Content Alignment
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: ce20888e-91bf-4dd5-a028-91d0e017e9ed
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: e05fb8e0-726b-4a55-b97f-aea98a58c8a1 # Heading Size
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: ec49629a-4218-4371-84ab-397eacb12030
+            userCondition: null
+            warning: null
+            width: 25
+          -
+            elementCondition: null
+            fieldUid: ef7dff82-7ddc-453d-b03e-6b90683f02bd # Font Weight
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 1e98708a-6a5f-4736-bd95-19243dcd4cab
+            userCondition: null
+            warning: null
+            width: 25
+          -
+            elementCondition: null
+            type: craft\fieldlayoutelements\HorizontalRule
+            uid: 76c64d5a-1d96-4799-95f0-5c993a5465a0
+            userCondition: null
+          -
+            elementCondition: null
+            fieldUid: d07b837d-c20e-48d9-ac52-34b7a29fbfcb # Container Id
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: b5da7eae-6771-43ca-b0b5-790e602c0640
+            userCondition: null
+            warning: null
+            width: 100
+        name: Settings
+        uid: e91b9c2b-3450-475d-9c19-33762c627f95
+        userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: d3ab5ad8-585b-43bc-b8ad-c093a04c787f # Minus Margin Top
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 0276ffb1-9043-4035-9795-5f166c57dd07
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 721f6c59-d353-4810-9d84-eee327f296be # Minus Margin Bottom
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 9a4b7015-12ad-47d2-98fd-d8e4d617a280
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            type: craft\fieldlayoutelements\HorizontalRule
+            uid: dab7bf9e-225e-4ea4-91c0-bf7a8aa56207
+            userCondition: null
+          -
+            elementCondition: null
+            fieldUid: bcbc592a-d4d0-4afa-92b6-458504f09b17 # Margin Top
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: ffd89b0c-8cbe-46a8-b676-87423879719b
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 9affc432-fe49-4e90-96ea-be5425095c2c # Margin Bottom
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 81c88736-faf3-4388-bc96-4fdfde15f499
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 3c44034a-42a6-4e12-a863-4f3cc325f1a4 # Padding Top
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 714baf93-9096-4571-b66f-988df9bddf7d
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 18de2689-3603-4c37-8473-396f9ce4f78c # Padding Bottom
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 65dbf91d-82ca-488b-9644-7d93dba1697b
+            userCondition: null
+            warning: null
+            width: 50
+        name: Spacing
+        uid: 8ff0416a-d0d7-430d-bb56-bad90d4403d8
+        userCondition: null
+handle: codeEmbed
+hasTitleField: false
+icon: brackets-curly
+name: 'Code / Embed'
+showSlugField: false
+showStatusField: true
+slugTranslationKeyFormat: null
+slugTranslationMethod: site
+titleFormat: ''
+titleTranslationKeyFormat: null
+titleTranslationMethod: site
diff --git a/config/project/entryTypes/trackingScript--67356d1e-de3d-4ceb-85ad-abf6b08ff9d2.yaml b/config/project/entryTypes/trackingScript--67356d1e-de3d-4ceb-85ad-abf6b08ff9d2.yaml
new file mode 100644
index 0000000..eccd188
--- /dev/null
+++ b/config/project/entryTypes/trackingScript--67356d1e-de3d-4ceb-85ad-abf6b08ff9d2.yaml
@@ -0,0 +1,140 @@
+color: null
+fieldLayouts:
+  ca5653cc-4d98-476a-a8b0-f6fb40c3db1b:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            includeInCards: false
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            providesThumbs: false
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 63748c8f-f313-4bb7-9606-431bb74c53d2
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 08f0c8e2-e9c0-426a-aab3-861fbf413a1f # Heading
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: b979d242-e740-4bad-861f-08b13cc492fa
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 05ed830d-e0d9-45c1-a952-f81bb441a524 # Script Position
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 4938d887-a81b-466a-8e36-ce314dec4c7d
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 45855582-b74b-4405-9639-34fc6b00d637 # Add only in Production?
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 5ea0354d-047d-48aa-b376-7e8fbf29b95f
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: c0909bba-5350-4f48-875b-48151f1f9f7c # Script Files
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: c08dd125-b41b-4344-a1e7-959c9aa9eb41
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 7afc8aef-c2ce-4275-ab1d-9a25238e9304 # Javascript Code
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 921d9710-c680-4983-90ea-cbea842478ba
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 910dab4f-1758-4717-b8f9-e8b63a73f3de # HTML Code
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 7af8e726-e11e-4328-b4ac-9801c1f669f0
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: e4172ce6-ee88-46c0-bbe1-f98869a90d3e
+        userCondition: null
+handle: trackingScript
+hasTitleField: false
+icon: scroll
+name: 'Tracking Script'
+showSlugField: false
+showStatusField: true
+slugTranslationKeyFormat: null
+slugTranslationMethod: site
+titleFormat: ''
+titleTranslationKeyFormat: null
+titleTranslationMethod: site
diff --git a/config/project/fields/addOnlyInProduction--45855582-b74b-4405-9639-34fc6b00d637.yaml b/config/project/fields/addOnlyInProduction--45855582-b74b-4405-9639-34fc6b00d637.yaml
new file mode 100644
index 0000000..a7bb9af
--- /dev/null
+++ b/config/project/fields/addOnlyInProduction--45855582-b74b-4405-9639-34fc6b00d637.yaml
@@ -0,0 +1,12 @@
+columnSuffix: null
+handle: addOnlyInProduction
+instructions: null
+name: 'Add only in Production?'
+searchable: false
+settings:
+  default: false
+  offLabel: 'NO'
+  onLabel: 'YES'
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\Lightswitch
diff --git a/config/project/fields/container--9b1a133a-4d4f-4a24-bb40-e59834fea921.yaml b/config/project/fields/container--9b1a133a-4d4f-4a24-bb40-e59834fea921.yaml
index 4716ef8..753422e 100644
--- a/config/project/fields/container--9b1a133a-4d4f-4a24-bb40-e59834fea921.yaml
+++ b/config/project/fields/container--9b1a133a-4d4f-4a24-bb40-e59834fea921.yaml
@@ -17,6 +17,7 @@ settings:
     - 28ccf5ae-cf72-492b-94c0-edbbbd1f411e # Checklist
     - 3d2181fb-3192-45b5-8817-c25be592f8e2 # Accordion
     - 0e63aa9f-6064-4094-ab28-0b9e7f6b8f09 # Image + Content
+    - 1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0 # Code / Embed
     - ec8cf3c5-a3d4-4c87-9c99-6807bee72059 # Two Columns
   includeTableView: false
   maxEntries: null
diff --git a/config/project/fields/contentBuilder--c14150f6-d51e-480d-9575-1091c8b07cb1.yaml b/config/project/fields/contentBuilder--c14150f6-d51e-480d-9575-1091c8b07cb1.yaml
index e2d3037..0ee026c 100644
--- a/config/project/fields/contentBuilder--c14150f6-d51e-480d-9575-1091c8b07cb1.yaml
+++ b/config/project/fields/contentBuilder--c14150f6-d51e-480d-9575-1091c8b07cb1.yaml
@@ -19,6 +19,7 @@ settings:
     - 1cf2528d-1b25-4d76-be36-e58ac8a4d68b # Stats Box
     - 3d2181fb-3192-45b5-8817-c25be592f8e2 # Accordion
     - 0e63aa9f-6064-4094-ab28-0b9e7f6b8f09 # Image + Content
+    - 1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0 # Code / Embed
     - ec8cf3c5-a3d4-4c87-9c99-6807bee72059 # Two Columns
     - a134d66d-e5d8-439a-bc68-e947c91e759b # Container
   includeTableView: false
diff --git a/config/project/fields/htmlCode--910dab4f-1758-4717-b8f9-e8b63a73f3de.yaml b/config/project/fields/htmlCode--910dab4f-1758-4717-b8f9-e8b63a73f3de.yaml
new file mode 100644
index 0000000..11617a7
--- /dev/null
+++ b/config/project/fields/htmlCode--910dab4f-1758-4717-b8f9-e8b63a73f3de.yaml
@@ -0,0 +1,16 @@
+columnSuffix: null
+handle: htmlCode
+instructions: null
+name: 'HTML Code'
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: false
+  initialRows: 4
+  multiline: true
+  placeholder: '<div>My HTML content goes here...</div>'
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/config/project/fields/javascriptCode--7afc8aef-c2ce-4275-ab1d-9a25238e9304.yaml b/config/project/fields/javascriptCode--7afc8aef-c2ce-4275-ab1d-9a25238e9304.yaml
new file mode 100644
index 0000000..65276b3
--- /dev/null
+++ b/config/project/fields/javascriptCode--7afc8aef-c2ce-4275-ab1d-9a25238e9304.yaml
@@ -0,0 +1,16 @@
+columnSuffix: null
+handle: javascriptCode
+instructions: 'Make sure we dont add <script> tag here.. Only js inner JS code.'
+name: 'Javascript Code'
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: false
+  initialRows: 4
+  multiline: true
+  placeholder: 'console.log("My code goes here...");'
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/config/project/fields/scriptFiles--c0909bba-5350-4f48-875b-48151f1f9f7c.yaml b/config/project/fields/scriptFiles--c0909bba-5350-4f48-875b-48151f1f9f7c.yaml
new file mode 100644
index 0000000..deb9d5f
--- /dev/null
+++ b/config/project/fields/scriptFiles--c0909bba-5350-4f48-875b-48151f1f9f7c.yaml
@@ -0,0 +1,100 @@
+columnSuffix: null
+handle: scriptFiles
+instructions: null
+name: 'Script Files'
+searchable: false
+settings:
+  addRowLabel: 'Add a row'
+  columns:
+    __assoc__:
+      -
+        - col1
+        -
+          __assoc__:
+            -
+              - heading
+              - URL
+            -
+              - handle
+              - url
+            -
+              - width
+              - ''
+            -
+              - type
+              - singleline
+      -
+        - col2
+        -
+          __assoc__:
+            -
+              - heading
+              - Type
+            -
+              - handle
+              - type
+            -
+              - width
+              - ''
+            -
+              - type
+              - select
+            -
+              - options
+              -
+                -
+                  __assoc__:
+                    -
+                      - label
+                      - JS
+                    -
+                      - value
+                      - js
+                    -
+                      - default
+                      - false
+                -
+                  __assoc__:
+                    -
+                      - label
+                      - CSS
+                    -
+                      - value
+                      - css
+                    -
+                      - default
+                      - false
+      -
+        - col3
+        -
+          __assoc__:
+            -
+              - heading
+              - Attributes
+            -
+              - handle
+              - attributes
+            -
+              - width
+              - ''
+            -
+              - type
+              - multiline
+  defaults:
+    -
+      __assoc__:
+        -
+          - col1
+          - ''
+        -
+          - col2
+          - js
+        -
+          - col3
+          - ''
+  maxRows: null
+  minRows: null
+  staticRows: false
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\Table
diff --git a/config/project/fields/scriptPosition--05ed830d-e0d9-45c1-a952-f81bb441a524.yaml b/config/project/fields/scriptPosition--05ed830d-e0d9-45c1-a952-f81bb441a524.yaml
new file mode 100644
index 0000000..5d8e537
--- /dev/null
+++ b/config/project/fields/scriptPosition--05ed830d-e0d9-45c1-a952-f81bb441a524.yaml
@@ -0,0 +1,15 @@
+columnSuffix: null
+handle: scriptPosition
+instructions: null
+name: 'Script Position'
+searchable: false
+settings:
+  cachedOptions: true
+  element: null
+  genError: ''
+  json: ''
+  template: _/sdf/scriptPosition.json
+  templateData: ''
+translationKeyFormat: null
+translationMethod: none
+type: amici\SuperDynamicFields\fields\SueprDynamicDropdownField
diff --git a/config/project/fields/trackingScripts--0d8c4992-13e5-49e7-bc75-c6a7036cd8fc.yaml b/config/project/fields/trackingScripts--0d8c4992-13e5-49e7-bc75-c6a7036cd8fc.yaml
new file mode 100644
index 0000000..fba4d4d
--- /dev/null
+++ b/config/project/fields/trackingScripts--0d8c4992-13e5-49e7-bc75-c6a7036cd8fc.yaml
@@ -0,0 +1,20 @@
+columnSuffix: null
+handle: trackingScripts
+instructions: null
+name: 'Tracking Scripts'
+searchable: false
+settings:
+  createButtonLabel: 'Tracking Script'
+  entryTypes:
+    - 67356d1e-de3d-4ceb-85ad-abf6b08ff9d2 # Tracking Script
+  includeTableView: false
+  maxEntries: null
+  minEntries: null
+  pageSize: null
+  propagationKeyFormat: null
+  propagationMethod: all
+  showCardsInGrid: false
+  viewMode: blocks
+translationKeyFormat: null
+translationMethod: site
+type: craft\fields\Matrix
diff --git a/config/project/globalSets/trackingScripts--be56efe1-2490-448d-9cf5-ac5c92a43952.yaml b/config/project/globalSets/trackingScripts--be56efe1-2490-448d-9cf5-ac5c92a43952.yaml
new file mode 100644
index 0000000..d52cf3b
--- /dev/null
+++ b/config/project/globalSets/trackingScripts--be56efe1-2490-448d-9cf5-ac5c92a43952.yaml
@@ -0,0 +1,27 @@
+fieldLayouts:
+  e5892262-d352-46bd-85e2-0af16ad1107b:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: 0d8c4992-13e5-49e7-bc75-c6a7036cd8fc # Tracking Scripts
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: f694bdd5-eb47-48ed-9038-dd5ee57adfb7
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: 14de99db-8f77-43bd-b9a2-5cad14edb524
+        userCondition: null
+handle: trackingScripts
+name: 'Tracking Scripts'
+sortOrder: 3
diff --git a/config/project/project.yaml b/config/project/project.yaml
index 517543b..d72ab73 100644
--- a/config/project/project.yaml
+++ b/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1720803063
+dateModified: 1720804492
 email:
   fromEmail: mufi@paragonn.com
   fromName: 'IJM Program Tracker'
@@ -33,9 +33,11 @@ meta:
   __names__:
     0b15cab4-22ae-40f3-9612-204b951f30f0: Image # Image
     0bb1f59a-bac9-4368-b972-bc346cf78bdb: Links # Links
+    0d8c4992-13e5-49e7-bc75-c6a7036cd8fc: 'Tracking Scripts' # Tracking Scripts
     0e13a17a-1829-4ccb-a64f-c39b6d62af82: 'Animation Offset' # Animation Offset
     0e63aa9f-6064-4094-ab28-0b9e7f6b8f09: 'Image + Content' # Image + Content
     00f64a37-6342-4ab0-a52b-d24123cb37e0: 'Info Box' # Info Box
+    1cbb1390-2bb5-47d8-afaa-fb0146a8e4d0: 'Code / Embed' # Code / Embed
     1cf2528d-1b25-4d76-be36-e58ac8a4d68b: 'Stats Box' # Stats Box
     1da620f4-95cb-4911-9332-8ef04cad860f: Button # Button
     02c1f367-dcb0-49f9-af0b-e255d2928b19: 'Show Border?' # Show Border?
@@ -53,9 +55,11 @@ meta:
     5c654d1e-8c51-46d6-9baa-d89900c8051a: 'Icon Card' # Icon Card
     5d2385da-c451-4d15-a8dc-9bf204cfb717: Eyebrow # Eyebrow
     5e460cf8-38e4-4ac9-8629-0c53ed9052c4: Jurisdictions # Jurisdictions
+    05ed830d-e0d9-45c1-a952-f81bb441a524: 'Script Position' # Script Position
     05f4aa96-2a20-4f5a-af29-371b169a6725: 'Current Status' # Current Status
     6a8efaa8-2ed0-497f-a528-78203c0632ab: 'Hero Image' # Hero Image
     6ae7d75d-cf9a-41db-b14d-a11c5a609f43: Icon # Icon
+    7afc8aef-c2ce-4275-ab1d-9a25238e9304: 'Javascript Code' # Javascript Code
     7b26f9bb-9eda-45e3-878a-0530263e4d2b: 'Stacked Cards' # Stacked Cards
     7bc32678-0f69-4111-926c-26e502c0c7fc: '1 Blank at?' # 1 Blank at?
     7be90189-1791-495b-a850-3bc340df0caf: Casework # Casework
@@ -102,6 +106,7 @@ meta:
     798cf224-57ed-4c61-bc6d-17cd588d0799: Home # Home
     811baf06-6695-4229-9067-1b2f8a49e13c: Images # Images
     887e8c04-ed78-4f44-afb0-408021c88446: 'Background Image' # Background Image
+    910dab4f-1758-4717-b8f9-e8b63a73f3de: 'HTML Code' # HTML Code
     970e66f8-69d9-430c-b4f9-74359ab8d3bd: Advanced # Advanced
     982eeecd-95ad-43d1-8cc2-f6b3d80be494: 'Basic Content' # Basic Content
     5249fb26-5dbb-40d0-8d43-eaa65ad75be1: Header # Header
@@ -118,11 +123,13 @@ meta:
     29046eec-f132-4f06-8bc6-2289a453e2b9: Split # Split
     31901f15-b181-4b05-8ae6-b070031679db: 'Icon Position' # Icon Position
     56196e9b-e1c4-44b3-817a-0f471121ed32: 'Quote Attribution' # Quote Attribution
+    67356d1e-de3d-4ceb-85ad-abf6b08ff9d2: 'Tracking Script' # Tracking Script
     72886fe1-8cd7-4787-bc4b-1b0a49aa82ba: 'Image Content' # Image Content
     395545e5-c12d-445f-b791-fe195138302c: 'General Information' # General Information
     434146a4-9bb6-41fc-8ce9-984ed4921d55: Country # Country
     948968bb-c8d8-4627-aaa9-aa1b20ada200: Hero # Hero
     21102308-0ca8-4b67-8663-daef265f4c60: 'Animation?' # Animation?
+    45855582-b74b-4405-9639-34fc6b00d637: 'Add only in Production?' # Add only in Production?
     97532141-63d3-4bec-a94a-313c6e99fefa: 'Button Color' # Button Color
     a08b46e9-7b38-45d1-98d4-7b4a827012ac: Accordion # Accordion
     a09ca3ab-fe0a-4cb3-83bd-6f37f4fd3260: 'Public Schema' # Public Schema
@@ -135,6 +142,8 @@ meta:
     bac5974c-f86b-4ef2-a13c-d4e61c2883b7: Jurisdictions # Jurisdictions
     bc97ce21-40cf-43a2-991d-94585d8fb43a: 'Icon Card' # Icon Card
     bcbc592a-d4d0-4afa-92b6-458504f09b17: 'Margin Top' # Margin Top
+    be56efe1-2490-448d-9cf5-ac5c92a43952: 'Tracking Scripts' # Tracking Scripts
+    c0909bba-5350-4f48-875b-48151f1f9f7c: 'Script Files' # Script Files
     c54b7104-c058-41f4-ac16-278920cf8062: 'Container Size' # Container Size
     c14150f6-d51e-480d-9575-1091c8b07cb1: 'Content Builder' # Content Builder
     cf6c9928-e050-4212-a498-0618e38611b1: Country # Country
diff --git a/templates/_/includes/macros.twig b/templates/_/includes/macros.twig
index a555e2a..0fa98a3 100644
--- a/templates/_/includes/macros.twig
+++ b/templates/_/includes/macros.twig
@@ -375,4 +375,18 @@
     {% if options.videoType not in ["background", "bgPopup"] or (not options.videos|length) %}
         {{ _self.setImage(options) }}
     {% endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
+
+{% macro trackingMacro(params) %}
+    {% set defaultsParams = {
+        script: null,
+        scriptHeading: null,
+        scriptFiles: null,
+        javascriptCode: null,
+        htmlCode: null
+    } %}
+
+    {# Override (overwrite) defaults with passed parameters #}
+    {% set options = defaultsParams|merge(params) %}
+    {% include "_/includes/macros/trackingMacro" with options %}
+{% endmacro %}
diff --git a/templates/_/includes/macros/trackingMacro.twig b/templates/_/includes/macros/trackingMacro.twig
new file mode 100644
index 0000000..c161fb4
--- /dev/null
+++ b/templates/_/includes/macros/trackingMacro.twig
@@ -0,0 +1,44 @@
+{% if scriptHeading|length %}<!-- START {{ scriptHeading|nl2br }}-->{% endif %}
+{% if scriptFiles|length %}
+{% for item in scriptFiles|filter(item => item.type == "css") %}
+    {% set attributesString = item.attributes %}
+
+    {% set attributes = {} %}
+
+    {% for pair in attributesString|split(' ') %}
+        {% set parts = pair|split('=') %}
+        {% if parts|length == 2 %}
+            {% set key = parts[0]|trim(' "') %}
+            {% set value = parts[1]|trim(' "') %}
+            {% set attributes = attributes|merge({(key): value}) %}
+        {% endif %}
+    {% endfor %}
+
+    {% do view.registerCssFile (item.url, attributes|raw) %}
+{% endfor %}
+
+{% for item in scriptFiles|filter(item => item.type == "js") %}
+    {% set attributesString = item.attributes %}
+
+    {% set attributes = {} %}
+
+    {% for pair in attributesString|split(' ') %}
+        {% set parts = pair|split('=') %}
+        {% if parts|length == 2 %}
+            {% set key = parts[0]|trim(' "') %}
+            {% set value = parts[1]|trim(' "') %}
+            {% set attributes = attributes|merge({(key): value}) %}
+        {% endif %}
+    {% endfor %}
+
+    {% do view.registerJsFile (item.url, attributes|raw) %}
+{% endfor %}
+{% endif %}
+
+{% if javascriptCode|length %}
+    {% js %}{{ javascriptCode|raw }}{% endjs %}
+{% endif %}
+
+{{ htmlCode|raw }}
+
+{% if scriptHeading|length %}<!-- END {{ scriptHeading|nl2br }}-->{% endif %}
\ No newline at end of file
diff --git a/templates/_/layouts/main.twig b/templates/_/layouts/main.twig
index ce6dee0..9b9033f 100644
--- a/templates/_/layouts/main.twig
+++ b/templates/_/layouts/main.twig
@@ -5,6 +5,7 @@
     lang: craft.app.language,
     class: 'scroll-smooth'
 } %}
+{% set trackingScripts = trackingScripts.trackingScripts.cache().all() %}
 <html {{ attr(htmlAttrs) }}>
     <head>
         <meta charset="UTF-8">
@@ -23,6 +24,17 @@
         {# <link rel="stylesheet" href="{{ mix('css/swiper.css') }}"> #}
         <link rel="stylesheet" href="{{ mix('css/glightbox.css') }}">
         <link rel="stylesheet" href="{{ mix('css/app.css') }}">
+
+        {# Include Tracking Scripts Head #}
+        {% for script in trackingScripts|filter(script => script.scriptPosition.value == "head" and (not script.addOnlyInProduction or (script.addOnlyInProduction and craft.app.config.env == "production"))) %}
+            {{ render.trackingMacro({
+                script: script,
+                scriptHeading: script.heading,
+                scriptFiles: script.scriptFiles,
+                javascriptCode: script.javascriptCode,
+                htmlCode: script.htmlCode
+            }) }}
+        {% endfor %}
     </head>
 
     {% set successNotification = successNotification ?? false %}
@@ -62,6 +74,17 @@
         @notifyerror="error=true,nError=true,errorHeading=(typeof($event.detail.heading) !== 'undefined' ? $event.detail.heading : ''),errorText=(typeof($event.detail.text) !== 'undefined' ? $event.detail.text : ''),resetTimeout()"
         :class="{ 'overflow-hidden': isOverflowHidden }"
     >
+        {# Include Tracking Scripts Head #}
+        {% for script in trackingScripts|filter(script => script.scriptPosition.value == "bodyStart" and (not script.addOnlyInProduction or (script.addOnlyInProduction and craft.app.config.env == "production"))) %}
+            {{ render.trackingMacro({
+                script: script,
+                scriptHeading: script.heading,
+                scriptFiles: script.scriptFiles,
+                javascriptCode: script.javascriptCode,
+                htmlCode: script.htmlCode
+            }) }}
+        {% endfor %}
+
         {#
         ============================================
             Include Header
@@ -108,6 +131,17 @@
 
         {% block footerScriptAfterApp %}{% endblock %}
 
+        {# Include Tracking Scripts Head #}
+        {% for script in trackingScripts|filter(script => script.scriptPosition.value == "bodyEnd" and (not script.addOnlyInProduction or (script.addOnlyInProduction and craft.app.config.env == "production"))) %}
+            {{ render.trackingMacro({
+                script: script,
+                scriptHeading: script.heading,
+                scriptFiles: script.scriptFiles,
+                javascriptCode: script.javascriptCode,
+                htmlCode: script.htmlCode
+            }) }}
+        {% endfor %}
+
         {# {% if currentUser|length and currentUser.can('accessCp') %} #}
             <script type="text/javascript" src="https://www.bugherd.com/sidebarv2.js?apikey=b0jzbj76kcohgf8t555y2w" async="true"></script>
         {# {% endif %} #}
diff --git a/templates/_/sdf/scriptPosition.json b/templates/_/sdf/scriptPosition.json
new file mode 100644
index 0000000..47eedff
--- /dev/null
+++ b/templates/_/sdf/scriptPosition.json
@@ -0,0 +1,5 @@
+[
+    { "label": "Head", "value": "head" },
+    { "label": "Body (Start)", "value": "bodyStart" },
+    { "label": "Body (End)", "value": "bodyEnd" }
+]
\ No newline at end of file