diff --git form_example/form_example.info form_example/form_example.info
index cb65884..41f840e 100644
--- form_example/form_example.info
+++ form_example/form_example.info
@@ -7,4 +7,5 @@ files[] = form_example.module
 files[] = form_example.install
 files[] = form_example_tutorial.inc
 files[] = form_example_states.inc
+files[] = form_example_multistep.inc
 files[] = form_example.test
diff --git form_example/form_example.module form_example/form_example.module
index ec95d17..e55a5e6 100644
--- form_example/form_example.module
+++ form_example/form_example.module
@@ -127,24 +127,18 @@ function form_example_menu() {
     'description' => 'How to use the #states attribute in FAPI',
     'file' => 'form_example_states.inc',
   );
+  $items['examples/form_example/wizard'] = array(
+    'title' => 'Extensible wizard example',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('form_example_wizard'),
+    'access callback' => TRUE,
+    'description' => 'A general approach to a wizard multistep form.',
+    'file' => 'form_example_wizard.inc',
+  );
   return $items;
 }
 
 function form_example_intro() {
-  $markup = t('The form example module provides a tutorial and a #states example');
-  return $markup;
+  $markup = t('The form example module provides a tutorial, extensible multistep example, and a #states example');
+  return array('#markup' => $markup);
 }
-
-/**
- * Implements hook_help() to provide a bit of help.
- */
-function form_example_help($path, $arg) {
-  switch($path) {
-    case 'examples/form_example/tutorial':
-      // TODO: Update the URL.
-      $help = t('This form example tutorial for Drupal 7 is the code from the <a href="http://drupal.org/node/262422">Handbook 10-step tutorial</a>');
-  }
-  if (!empty($help)) {
-    return '<p>' . $help . '</p>';
-  }
-}
\ No newline at end of file
diff --git form_example/form_example_wizard.inc form_example/form_example_wizard.inc
new file mode 100644
index 0000000..94ed512
--- /dev/null
+++ form_example/form_example_wizard.inc
@@ -0,0 +1,188 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Estensible wizard form example.
+ *
+ * To extend this example:
+ * - Add elements to the $form_state['step_information'] array.
+ * - Implement the 'form' function for each element.
+ * - Change the submit handler to do something with the collected data at the
+ *   end of processing.
+ * - Optionally add one or more validation functions with name
+ *   $form_state['step_information'][$step]['name'] . '_validate'.
+ */
+
+/**
+ * The primary formbuilder function for the wizard form.
+ */
+function form_example_wizard($form, &$form_state) {
+
+  // Initialize a description of the steps for the wizard.
+  if (empty($form_state['step'])) {
+    $form_state['step'] = 1;
+
+    // This array contains the function to be called at each step to get the
+    // relevant form elements. It will also store state information for each
+    // step.
+    $form_state['step_information'] = array(
+      1 => array(
+        'form' => 'form_example_wizard_personal_info',
+      ),
+      2 => array(
+        'form' => 'form_example_wizard_location_info',
+      ),
+      3 => array(
+        'form' => 'form_example_wizard_other_info',
+      ),
+    );
+  }
+
+  $step = &$form_state['step'];
+
+  // Call the function named in $form_state['step_information'] to get the
+  // form elements to display for this step.
+  $form = $form_state['step_information'][$step]['form']($form, &$form_state);
+
+  // Show the 'previous' button if appropriate. Note that #submit is set to
+  // a special submit handler, and that we use #limit_validation_errors() to
+  // skip all complaints about validation when using the back button. The
+  // assumption is that we'll get to the errors when we return and use the
+  // 'next' button.
+  if ($step > 1) {
+    $form['prev'] = array(
+      '#type' => 'submit',
+      '#value' => t('Previous'),
+      '#name' => 'prev',
+      '#submit' => array('form_example_wizard_previous_submit'),
+      '#limit_validation_errors' => array(),
+    );
+  }
+  $form['next'] = array(
+    '#type' => 'submit',
+    '#value' => t('Next'),
+  );
+  if ($step >= count($form_state['step_information'])) {
+    $form['next']['#value'] = t('Finish');
+  }
+  if (function_exists($form_state['step_information'][$step]['form'] . '_validate')) {
+    $form['next']['#validate'] = array($form_state['step_information'][$step]['form'] . '_validate');
+  }
+//  if (function_exists($steps['step'] . '_submit')) {
+//    $form['next']['#submit'] = array($steps['step'] . '_submit');
+//  }
+
+  return $form;
+}
+
+/**
+ * Submit handler for the "previous" button.
+ * - Stores aways $form_state['values']
+ * - Decrements the step counter
+ * - Replaces $form_state['values'] with the values from the previous state.
+ * - Forces form rebuild.
+ */
+function form_example_wizard_previous_submit($form, &$form_state) {
+  $current_step = &$form_state['step'];
+  $form_state['step_information'][$current_step]['stored_values'] = $form_state['values'];
+  if ($current_step > 1) {
+    $current_step--;
+    $form_state['values'] = $form_state['step_information'][$current_step]['stored_values'];
+  }
+  $form_state['rebuild'] = TRUE;
+}
+
+/**
+ * Submit handler for the 'next' button.
+ * - Saves away $form_state['values']
+ * - If we're not at the end,
+ *   - Increment the step count.
+ *   - Replace $form_state['values'] from the last time we were at this page
+ *     or with array() if we haven't been here before.
+ *   - Force form rebuild.
+ * - Otherwise:
+ *   - Process all the form values. In this case we just do a
+ *     drupal_set_message() with them.
+ * @param unknown_type $form
+ * @param unknown_type $form_state
+ */
+function form_example_wizard_submit($form, &$form_state) {
+  $current_step = &$form_state['step'];
+  $form_state['step_information'][$current_step]['stored_values'] = $form_state['values'];
+
+  if ($current_step < count($form_state['step_information'])) {
+    $current_step++;
+    if (!empty($form_state['step_information'][$current_step]['stored_values'])) {
+      $form_state['values'] = $form_state['step_information'][$current_step]['stored_values'];
+    }
+    else {
+      $form_state['values'] = array();
+    }
+    $form_state['rebuild'] = TRUE;  // Force rebuild with next step.
+    return;
+  }
+
+  // In this case we've completed the final page of the wizard, so process the
+  // submitted information.
+  drupal_set_message(t('This information was collected:'));
+  foreach($form_state['step_information'] as $index => $value) {
+    drupal_set_message(t('@num: @result', array('@num' => $index, '@result' => print_r($value['stored_values'], TRUE))));
+  }
+}
+
+/**
+ * Returns form elements for the 'personal info' page of the wizard.
+ */
+function form_example_wizard_personal_info($form, &$form_state) {
+  $form = array();
+  $form['first_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('First Name'),
+    '#default_value' => !empty($form_state['values']['first_name']) ? $form_state['values']['first_name'] : '',
+  );
+  $form['last_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Last Name'),
+    '#default_value' => !empty($form_state['values']['last_name']) ? $form_state['values']['last_name'] : '',
+  );
+  return $form;
+}
+
+/**
+ * Returns form elements for the 'location info' page of the wizard.
+ */
+function form_example_wizard_location_info($form, &$form_state) {
+  $form = array();
+  $form['city'] = array(
+    '#type' => 'textfield',
+    '#title' => t('City'),
+    '#description' => t('Hint: Do not enter "San Francisco", and do not leave this out.'),
+    '#required' => TRUE,
+    '#default_value' => !empty($form_state['values']['city']) ? $form_state['values']['city'] : '',
+
+  );
+  return $form;
+}
+
+/**
+ * Custom validation form for the 'location info' page of the wizard.
+ */
+function form_example_wizard_location_info_validate($form, &$form_state) {
+  if ($form_state['values']['city'] == 'San Francisco') {
+    form_set_error('city', t('You were warned not to enter "San Francisco"'));
+  }
+}
+
+/**
+ * Returns form elements for the 'other info' page of the wizard.
+ */
+function form_example_wizard_other_info($form, &$form_state) {
+  $form = array();
+  $form['aunts_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Your first cousin's aunt's Social Security number"),
+    '#default_value' => !empty($form_state['values']['aunts_name']) ? $form_state['values']['aunts_name'] : '',
+  );
+  return $form;
+}