diff --git a/blocks/checkbox-fieldset/checkbox-fieldset.css b/blocks/checkbox-fieldset/checkbox-fieldset.css
new file mode 100644
index 00000000..e69de29b
diff --git a/blocks/checkbox-fieldset/checkbox-fieldset.js b/blocks/checkbox-fieldset/checkbox-fieldset.js
new file mode 100644
index 00000000..24718097
--- /dev/null
+++ b/blocks/checkbox-fieldset/checkbox-fieldset.js
@@ -0,0 +1,3 @@
+export default function init(el) {
+  console.log('checkbox loaded.');
+}
diff --git a/blocks/events-form/events-form.js b/blocks/events-form/events-form.js
index ea9e4f7d..7c785d85 100644
--- a/blocks/events-form/events-form.js
+++ b/blocks/events-form/events-form.js
@@ -358,7 +358,7 @@ async function updateDynamicContent(bp) {
   await Promise.all([
     import(`${getLibs()}/utils/getUuid.js`),
     import('../../utils/event-apis.js'),
-    import('../page-server/page-server.js'),
+    import('../../utils/utils.js'),
   ]).then(async ([{ default: getUuid }, caasApiMod, { autoUpdateContent }]) => {
     const hash = await getUuid(window.location.pathname);
     let profile;
@@ -373,7 +373,7 @@ async function updateDynamicContent(bp) {
       await decorateRSVPStatus(bp, profile);
     }
 
-    await autoUpdateContent(block, { ...await caasApiMod.default(hash), ...profile }, true);
+    await autoUpdateContent(block, { ...await caasApiMod.default(hash), ...profile });
     eventHero.classList.remove('loading');
     personalizeForm(block, profile);
   });
diff --git a/blocks/form-handler/form-handler.css b/blocks/form-handler/form-handler.css
new file mode 100644
index 00000000..e69de29b
diff --git a/blocks/form-handler/form-handler.js b/blocks/form-handler/form-handler.js
new file mode 100644
index 00000000..eceeecce
--- /dev/null
+++ b/blocks/form-handler/form-handler.js
@@ -0,0 +1,3 @@
+export default function init(el) {
+  console.log('handler loaded');
+}
diff --git a/utils/utils.js b/utils/utils.js
index 29e16c40..1998006c 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -16,6 +16,15 @@ export function yieldToMain() {
   });
 }
 
+export function getIcon(tag) {
+  const img = document.createElement('img');
+  img.className = `icon icon-${tag}`;
+  img.src = `/icons/${tag}.svg`;
+  img.alt = tag;
+
+  return img;
+}
+
 function handleRegisterButton(a) {
   const signIn = () => {
     if (typeof window.adobeIMS?.signIn !== 'function') {
@@ -97,14 +106,14 @@ function updateTextNode(child, matchCallback) {
 }
 
 // data -> dom gills
-export function autoUpdateContent(parent) {
+export function autoUpdateContent(parent, extraData) {
   if (!parent) {
     window.lana?.log('page server block cannot find its parent element');
     return;
   }
 
   const getContent = (_match, p1, n) => {
-    const content = getMetadata(p1) || '';
+    const content = getMetadata(p1) || extraData?.[p1] || '';
     if (preserveFormatKeys.includes(p1)) {
       n.parentNode?.classList.add('preserve-format');
     }