diff --git a/includes/class-hvac-event-form-builder.php b/includes/class-hvac-event-form-builder.php
index 1d86a626..88317aa6 100644
--- a/includes/class-hvac-event-form-builder.php
+++ b/includes/class-hvac-event-form-builder.php
@@ -125,8 +125,8 @@ class HVAC_Event_Form_Builder extends HVAC_Form_Builder {
         $this->template_manager = HVAC_Event_Template_Manager::instance();
         $this->template_mode_enabled = $enable_templates;
 
-        // Initialize cache if available (not implemented yet)
-        // $this->cache = class_exists('HVAC_Event_Cache') ? HVAC_Event_Cache::instance() : null;
+        // Initialize cache if available
+        $this->cache = class_exists('HVAC_Event_Cache') ? HVAC_Event_Cache::instance() : null;
 
         $this->init_event_form_hooks();
     }
@@ -506,7 +506,7 @@ class HVAC_Event_Form_Builder extends HVAC_Form_Builder {
      */
     private function get_timezone_options(): array {
         // Check cache first
-        $cached_timezones = $this->cache->get_timezone_list();
+        $cached_timezones = $this->cache ? $this->cache->get_timezone_list() : false;
 
         if ($cached_timezones !== false) {
             return $cached_timezones;
@@ -523,7 +523,9 @@ class HVAC_Event_Form_Builder extends HVAC_Form_Builder {
         }
 
         // Cache the results
-        $this->cache->cache_timezone_list($timezone_options);
+        if ($this->cache) {
+            $this->cache->cache_timezone_list($timezone_options);
+        }
 
         return $timezone_options;
     }
@@ -536,7 +538,7 @@ class HVAC_Event_Form_Builder extends HVAC_Form_Builder {
     private function get_venue_options(): array {
         // Check cache first
         $cache_key = 'venue_options_' . get_current_user_id();
-        $cached_venues = $this->cache->get_venue_search($cache_key);
+        $cached_venues = $this->cache ? $this->cache->get_venue_search($cache_key) : false;
 
         if ($cached_venues !== false) {
             return $cached_venues;
@@ -566,7 +568,9 @@ class HVAC_Event_Form_Builder extends HVAC_Form_Builder {
         }
 
         // Cache the results
-        $this->cache->cache_venue_search($cache_key, $venue_options);
+        if ($this->cache) {
+            $this->cache->cache_venue_search($cache_key, $venue_options);
+        }
 
         return $venue_options;
     }
diff --git a/includes/class-hvac-form-builder.php b/includes/class-hvac-form-builder.php
index af9bb9de..c4cf5925 100644
--- a/includes/class-hvac-form-builder.php
+++ b/includes/class-hvac-form-builder.php
@@ -26,28 +26,28 @@ class HVAC_Form_Builder {
 	 *
 	 * @var array
 	 */
-	private array $fields = [];
+	protected array $fields = [];
 
 	/**
 	 * Form attributes
 	 *
 	 * @var array
 	 */
-	private array $form_attrs = [];
+	protected array $form_attrs = [];
 
 	/**
 	 * Form errors
 	 *
 	 * @var array
 	 */
-	private array $errors = [];
+	protected array $errors = [];
 
 	/**
 	 * Form data
 	 *
 	 * @var array
 	 */
-	private array $data = [];
+	protected array $data = [];
 
 	/**
 	 * Constructor with promoted property.
@@ -55,7 +55,7 @@ class HVAC_Form_Builder {
 	 * @param string $nonce_action Nonce action for the form
 	 */
 	public function __construct(
-		private string $nonce_action
+		protected string $nonce_action
 	) {
 		$this->set_default_attributes();
 	}
@@ -168,7 +168,7 @@ class HVAC_Form_Builder {
 	 *
 	 * @return string
 	 */
-	private function get_form_attributes(): string {
+	protected function get_form_attributes(): string {
 		$attrs = [];
 		foreach ( $this->form_attrs as $key => $value ) {
 			if ( ! empty( $value ) ) {
@@ -184,7 +184,7 @@ class HVAC_Form_Builder {
 	 * @param array $field Field configuration
 	 * @return string
 	 */
-	private function render_field( $field ) {
+	protected function render_field( $field ) {
 		$output = sprintf( '<div class="%s">', esc_attr( $field['wrapper_class'] ) );
 		
 		// Label
@@ -262,7 +262,7 @@ class HVAC_Form_Builder {
 	 * @param array $field Field configuration
 	 * @return string
 	 */
-	private function render_select( $field ) {
+	protected function render_select( $field ) {
 		$value = $this->get_field_value( $field['name'], $field['value'] );
 		
 		$output = sprintf(
@@ -375,7 +375,7 @@ class HVAC_Form_Builder {
 	 * @param mixed  $default Default value
 	 * @return mixed
 	 */
-	private function get_field_value( $name, $default = '' ) {
+	protected function get_field_value( $name, $default = '' ) {
 		return isset( $this->data[ $name ] ) ? $this->data[ $name ] : $default;
 	}
 
diff --git a/templates/page-create-event.php b/templates/page-create-event.php
index 420a7d43..ec047ed8 100644
--- a/templates/page-create-event.php
+++ b/templates/page-create-event.php
@@ -53,36 +53,80 @@ get_header();
     
     <div class="hvac-page-content">
         <?php
-        // Render the TEC form for structure, but enhance it with REST API
-        echo do_shortcode('[tribe_community_events view="submission_form"]');
+        // Handle form submission
+        if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['hvac_event_form_nonce'])) {
+            if (wp_verify_nonce($_POST['hvac_event_form_nonce'], 'hvac_event_form')) {
+                try {
+                    // Create event form builder instance with template support
+                    $event_form = new HVAC_Event_Form_Builder('hvac_event_form', true);
+                    $event_form->create_event_form();
+
+                    // Validate submitted data
+                    $form_errors = $event_form->validate($_POST);
+
+                    if (empty($form_errors)) {
+                        // Sanitize data
+                        $sanitized_data = $event_form->sanitize($_POST);
+
+                        // Create event using native WordPress
+                        $post_handler = HVAC_Event_Post_Handler::instance();
+                        $event_id = $post_handler->create_event($sanitized_data);
+
+                        if (!is_wp_error($event_id)) {
+                            $success_message = "Event created successfully! Event ID: {$event_id}";
+                            $form_submitted = true;
+                        } else {
+                            $form_errors['general'] = 'Event creation failed: ' . $event_id->get_error_message();
+                        }
+                    }
+                } catch (Exception $e) {
+                    $form_errors['general'] = 'Form error: ' . $e->getMessage();
+                }
+            } else {
+                $form_errors['nonce'] = 'Security check failed. Please try again.';
+            }
+        }
+
+        // Display success message
+        if (isset($success_message)) {
+            echo '<div class="hvac-form-notice" style="background: #d4edda; border-color: #c3e6cb; color: #155724;">';
+            echo '<p>' . esc_html($success_message) . '</p>';
+            echo '</div>';
+        }
+
+        // Display errors
+        if (isset($form_errors['general'])) {
+            echo '<div style="background: #f8d7da; border: 1px solid #f5c6cb; padding: 12px; border-radius: 4px; margin-bottom: 20px;">';
+            echo esc_html($form_errors['general']);
+            echo '</div>';
+        }
+
+        // Create and display the event form with template support
+        try {
+            $event_form = new HVAC_Event_Form_Builder('hvac_event_form', true);
+            $event_form->create_event_form();
+
+            // Set any existing errors
+            if (!empty($form_errors)) {
+                $event_form->set_errors($form_errors);
+            }
+
+            // Set form data if submitted (for re-population on errors)
+            if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+                $event_form->set_data($_POST);
+            }
+
+            echo $event_form->render();
+
+        } catch (Exception $e) {
+            echo '<div style="background: #f8d7da; border: 1px solid #f5c6cb; padding: 12px; border-radius: 4px;">';
+            echo 'Form Builder Error: ' . esc_html($e->getMessage());
+            echo '</div>';
+        }
         ?>
     </div>
 </div>
 
-<script>
-// Inline script to ensure REST API enhancement loads
-jQuery(document).ready(function($) {
-    console.log('[Create Event Page] Initializing REST API enhancement...');
-    
-    // Check if REST API script is loaded
-    if (typeof HVACRestEventSubmission !== 'undefined') {
-        console.log('[Create Event Page] REST API script already loaded');
-    } else {
-        console.log('[Create Event Page] Loading REST API script...');
-        // Dynamically load the REST API script if not already loaded
-        $.getScript('<?php echo HVAC_PLUGIN_URL; ?>assets/js/hvac-rest-api-event-submission.js')
-            .done(function() {
-                console.log('[Create Event Page] REST API script loaded successfully');
-                if (typeof HVACRestEventSubmission !== 'undefined') {
-                    HVACRestEventSubmission.init();
-                }
-            })
-            .fail(function() {
-                console.error('[Create Event Page] Failed to load REST API script');
-            });
-    }
-});
-</script>
 
 <?php
 get_footer();
diff --git a/templates/page-native-event-test.php b/templates/page-native-event-test.php
index d697d236..0bece686 100644
--- a/templates/page-native-event-test.php
+++ b/templates/page-native-event-test.php
@@ -136,7 +136,7 @@ get_header();
 
             try {
                 // Create event form builder instance
-                $event_form = new HVAC_Event_Form_Builder('hvac_event_form');
+                $event_form = new HVAC_Event_Form_Builder('hvac_event_form', true);
                 $event_form->create_event_form();
 
                 // Validate submitted data
@@ -190,7 +190,7 @@ get_header();
 
     // Create and display the event form
     try {
-        $event_form = new HVAC_Event_Form_Builder('hvac_event_form');
+        $event_form = new HVAC_Event_Form_Builder('hvac_event_form', true);
         $event_form->create_event_form();
 
         // Set any existing errors