Added callbacks for oa_wizard completion and refactored code out of the drupal behavior