diff --git a/dev/custom-fn.js b/dev/custom-fn.js
index 2d8af3a..58df1a4 100644
--- a/dev/custom-fn.js
+++ b/dev/custom-fn.js
@@ -6,7 +6,16 @@ module.exports = function() {
   var Clay = window.Clay = this;
 
   Clay.on(Clay.EVENTS.BEFORE_BUILD, function() {
-    console.debug('KEEGAN: BEFORE_BUILD', this);
+
+    // register components here
+    this.registerComponent(require('pebble-clay-components').heading);
+    this.registerComponent(require('pebble-clay-components').text);
+    this.registerComponent(require('pebble-clay-components').footer);
+    this.registerComponent(require('pebble-clay-components').input);
+    this.registerComponent(require('pebble-clay-components').color);
+    this.registerComponent(require('pebble-clay-components').select);
+    this.registerComponent(require('pebble-clay-components').toggle);
+    this.registerComponent(require('pebble-clay-components').submit);
   });
 
   Clay.on(Clay.EVENTS.AFTER_BUILD, function() {
diff --git a/src/scripts/config-page.js b/src/scripts/config-page.js
index 2426b2e..6d447a7 100755
--- a/src/scripts/config-page.js
+++ b/src/scripts/config-page.js
@@ -12,19 +12,7 @@ var customFn = window.customFn || function() {};
 var $mainForm = $('#main-form');
 var clayConfig = new ClayConfig(settings, config, $mainForm);
 
-clayConfig.on(clayConfig.EVENTS.BEFORE_BUILD, function() {
-
-  // register components here
-  this.registerComponent(require('pebble-clay-components').heading);
-  this.registerComponent(require('pebble-clay-components').text);
-  this.registerComponent(require('pebble-clay-components').footer);
-  this.registerComponent(require('pebble-clay-components').input);
-  this.registerComponent(require('pebble-clay-components').color);
-  this.registerComponent(require('pebble-clay-components').select);
-  this.registerComponent(require('pebble-clay-components').toggle);
-  this.registerComponent(require('pebble-clay-components').submit);
-});
-
+/* istanbul ignore next */ // @todo reassess how to do form submission
 clayConfig.on(clayConfig.EVENTS.AFTER_BUILD, function() {
   var self = this;