diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 7226ce4f9..69f336f56 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1583,7 +1583,7 @@ sub www_manageAssets {
 		}
 		my $lockLink = ", '<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."<\\/a>'" unless ($self->session->setting->get("autoCommit"));
          	$output .= "assetManager.AddLine('"
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session,{
 				name=>'assetId',
 				value=>$child->getId
 				})
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 175364db5..59f03cfce 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -467,7 +467,7 @@ $style .= '
 			template=>$style
 			})->www_edit;
 	} else {
-		$output = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl}).WebGUI::Form::hidden({name=>"func", value=>"styleWizard"});
+		$output = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl}).WebGUI::Form::hidden($self->session,{name=>"func", value=>"styleWizard"});
 		$output .= WebGUI::Form::hidden($self->session,{name=>"proceed", value=>"manageAssets"}) if ($self->session->form->process("proceed"));
 		$output .= '<style type="text/css">
 			.chooser { float: left; width: 150px; height: 150px; } 
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index bb5176662..e024dd2ff 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -960,22 +960,22 @@ sub www_search {
         $var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
          	.WebGUI::Form::hidden($self->session,{ name=>"func", value=>"search" })
         	.WebGUI::Form::hidden($self->session,{ name=>"doit", value=>1 });
-        $var{'all.form'} = WebGUI::Form::text({
+        $var{'all.form'} = WebGUI::Form::text($self->session,{
                 name=>'all',
                 value=>$self->session->scratch->get($self->getId."_all"),
                 size=>($self->session->setting->get("textBoxSize")-5)
                 });
-        $var{'exactphrase.form'} = WebGUI::Form::text({
+        $var{'exactphrase.form'} = WebGUI::Form::text($self->session,{
                 name=>'exactPhrase',
                 value=>$self->session->scratch->get($self->getId."_exactPhrase"),
                 size=>($self->session->setting->get("textBoxSize")-5)
                 });
-        $var{'atleastone.form'} = WebGUI::Form::text({
+        $var{'atleastone.form'} = WebGUI::Form::text($self->session,{
                 name=>'atLeastOne',
                 value=>$self->session->scratch->get($self->getId."_atLeastOne"),
                 size=>($self->session->setting->get("textBoxSize")-5)
                 });
-        $var{'without.form'} = WebGUI::Form::text({
+        $var{'without.form'} = WebGUI::Form::text($self->session,{
                 name=>'without',
                 value=>$self->session->scratch->get($self->getId."_without"),
                 size=>($self->session->setting->get("textBoxSize")-5)
@@ -984,7 +984,7 @@ sub www_search {
         tie %results, 'Tie::IxHash';
         %results = (10=>'10', 25=>'25', 50=>'50', 100=>'100');
         my $numResults = $self->session->scratch->get($self->getId."_numResults") || $self->get("threadsPerPage");
-        $var{'results.form'} = WebGUI::Form::selectBox({
+        $var{'results.form'} = WebGUI::Form::selectBox($self->session,{
                 name=>"numResults",
                 options=>\%results,
                 value=>[$numResults]
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index cdc43345f..461998ad5 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -132,7 +132,7 @@ sub getCompareForm {
 				where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by productName")
 			})
 		."<br />"
-		.WebGUI::Form::submit({
+		.WebGUI::Form::submit($self->session,{
 			value=>"compare"
 			})
 		."</form>";
@@ -816,20 +816,20 @@ sub www_search {
 	}
 	$var{'compare.form'} = $self->getCompareForm(@list);
 	$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
-		.WebGUI::Form::hidden({
+		.WebGUI::Form::hidden($self->session,{
 			name=>"doit",
 			value=>"1"
 			})
-		.WebGUI::Form::hidden({
+		.WebGUI::Form::hidden($self->session,{
 			name=>"func",
 			value=>"search"
 			});
 	$var{'form.footer'} = "</form>";
-	$var{'form.keyword'} = WebGUI::Form::text({
+	$var{'form.keyword'} = WebGUI::Form::text($self->session,{
 		name=>"keyword",
 		value=>$self->session->form->process("keyword")
 		});
-	$var{'form.submit'} = WebGUI::Form::submit({
+	$var{'form.submit'} = WebGUI::Form::submit($self->session,{
 		value=>"search"
 		});
 	foreach my $category ($self->getCategories()) {
@@ -841,12 +841,12 @@ sub www_search {
 			$data->{description} =~ s/'/\\\'/g;
 			$data->{description} =~ s/"/\&quot;/g;
 			if ($data->{fieldType} ne "goodBad") {
-				$data->{form} = WebGUI::Form::text({
+				$data->{form} = WebGUI::Form::text($self->session,{
 					name=>$data->{name},
 					value=>$self->session->form->process($data->{name})
 					});
 			} else {
-				$data->{form} = WebGUI::Form::checkbox({
+				$data->{form} = WebGUI::Form::checkbox($self->session,{
 					name=>$data->{name},
 					value=>"1",
 					checked=>$self->session->form->process($data->{name})
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 2638ebd9c..8fc0ee9cb 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -137,7 +137,7 @@ sub getEditForm {
 		);
 	$tabform->getTab("properties")->raw(
 		'</tbody><tbody id="navAncestorEnd"><tr><td class="formDescription">'.$i18n->get("Ancestor End Point").'</td><td>'
-		.WebGUI::Form::selectBox({
+		.WebGUI::Form::selectBox($self->session,{
 			name=>"ancestorEndPoint",
 			value=>[$self->getValue("ancestorEndPoint")],
 			options=>\%options
@@ -147,29 +147,29 @@ sub getEditForm {
 	$tabform->getTab("properties")->readOnly(
 		-label=>$i18n->get("Relatives To Include"),
 		-hoverHelp=>$i18n->get("Relatives To Include description"),
-		-value=>WebGUI::Form::checkbox({
+		-value=>WebGUI::Form::checkbox($self->session,{
 				checked=>$ancestorsChecked,
 				name=>"assetsToInclude",
 				extras=>'onChange="toggleAncestorEndPoint()"',
 				value=>"ancestors"
 				}).$i18n->get('Ancestors').'<br />'
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session,{
 				checked=>$selfChecked,
 				name=>"assetsToInclude",
 				value=>"self"
 				}).$i18n->get('Self').'<br />'
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session,{
 				checked=>$siblingsChecked,
 				name=>"assetsToInclude",
 				value=>"siblings"
 				}).$i18n->get('Siblings').'<br />'
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session,{
 				checked=>$descendantsChecked,
 				name=>"assetsToInclude",
 				value=>"descendants",
 				extras=>'onChange="toggleDescendantEndPoint()"'
 				}).$i18n->get('Descendants').'<br />'
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session,{
 				checked=>$pedigreeChecked,
 				name=>"assetsToInclude",
 				value=>"pedigree"
@@ -187,7 +187,7 @@ sub getEditForm {
 		);
 	$tabform->getTab("properties")->raw(
 		'</tbody><tbody id="navDescendantEnd"><tr><td class="formDescription">'.$i18n->get('Descendant End Point').'</td><td>'
-		.WebGUI::Form::selectBox({
+		.WebGUI::Form::selectBox($self->session,{
 			name=>"descendantEndPoint",
 			value=>[$self->getValue("descendantEndPoint")],
 			options=>\%options
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 8c8b04f29..a1bc26cec 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -406,27 +406,27 @@ sub getQuestionVars {
 	$var{'question.question'} = $question->{question};
 	$var{'question.allowComment'} = $question->{allowComment};
 	$var{'question.id'} = $question->{Survey_questionId};
-	$var{'question.comment.field'} = WebGUI::Form::textarea({
+	$var{'question.comment.field'} = WebGUI::Form::textarea($self->session,{
 		name=>'comment_'.$questionId
 		});
 	$var{'question.comment.label'} = $i18n->get(51);
 
 	my $answer;
 	($answer) = $self->session->db->quickArray("select Survey_answerId from Survey_answer where Survey_questionId=".$self->session->db->quote($question->{Survey_questionId}));
-	$var{'question.answer.field'} = WebGUI::Form::hidden({
+	$var{'question.answer.field'} = WebGUI::Form::hidden($self->session,{
 			name=>'answerId_'.$questionId,
 			value=>$answer
 			});
 	if ($question->{answerFieldType} eq "text") {
-		$var{'question.answer.field'} .= WebGUI::Form::text({
+		$var{'question.answer.field'} .= WebGUI::Form::text($self->session,{
 			name=>'textResponse_'.$questionId
 			});
 	} elsif ($question->{answerFieldType} eq "HTMLArea") {
-		$var{'question.answer.field'} .= WebGUI::Form::HTMLArea({
+		$var{'question.answer.field'} .= WebGUI::Form::HTMLArea($self->session,{
 			name=>'textResponse_'.$questionId
 			});
 	} elsif ($question->{answerFieldType} eq "textArea") {
-		$var{'question.answer.field'} .= WebGUI::Form::textarea({
+		$var{'question.answer.field'} .= WebGUI::Form::textarea($self->session,{
 			name=>'textResponse_'.$questionId
 			});
 	} else {
@@ -434,7 +434,7 @@ sub getQuestionVars {
 		if ($question->{randomizeAnswers}) {
 			$answer = randomizeHash($answer);
 		}
-		$var{'question.answer.field'} = WebGUI::Form::radioList({
+		$var{'question.answer.field'} = WebGUI::Form::radioList($self->session,{
 			options=>$answer,
 			name=>"answerId_".$questionId,
 			vertical=>1
@@ -670,12 +670,12 @@ sub view {
 		}
 	}
 	$var->{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
-		.WebGUI::Form::hidden({
+		.WebGUI::Form::hidden($self->session,{
 			name=>'func',
 			value=>'respond'
 			});
 	$var->{'form.footer'} = WebGUI::Form::formFooter($self->session,);
-	$var->{'form.submit'} = WebGUI::Form::submit({
+	$var->{'form.submit'} = WebGUI::Form::submit($self->session,{
 			value=>$i18n->get(50)
 			});
 	$var->{'questions.sofar.label'} = $i18n->get(86);
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 087cd5ee4..204c01fa6 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -338,7 +338,7 @@ $self->session->style->setLink($self->session->config->get("extrasURL").'/assetM
 		my $title = $child->getTitle;
                 $title =~ s/\'/\\\'/g;
                 $output .= "assetManager.AddLine('"
-                        .WebGUI::Form::checkbox({
+                        .WebGUI::Form::checkbox($self->session,{
                                 name=>'assetId',
                                 value=>$child->getId
                                 })
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 35b4dba7e..62db567a2 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -139,7 +139,7 @@ sub www_checkoutConfirm {
 
 	foreach (@$normal) {
 		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
-		$_->{'quantity.form'} = WebGUI::Form::integer({
+		$_->{'quantity.form'} = WebGUI::Form::integer($session,{
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
 			size	=> 3,
@@ -148,7 +148,7 @@ sub www_checkoutConfirm {
 	}
 	foreach (@$recurring) {
 		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
-		$_->{'quantity.form'} = WebGUI::Form::integer({
+		$_->{'quantity.form'} = WebGUI::Form::integer($session,{
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
 			size	=> 3,
@@ -593,16 +593,16 @@ sub www_listTransactions {
 
 	$output .= $i18n->get('selection message');
 	
-	$output .= WebGUI::Form::formHeader;
+	$output .= WebGUI::Form::formHeader($session);
 	$output .= WebGUI::Form::hidden($session,{name=>'op', value=>'listTransactions'});
 	$output .= '<table>';
 	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'init', checked=>($session->form->process("selection") eq 'init')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('init date').'</td>';
-	$output .= '<td>'.WebGUI::Form::date($session,{name=>'initStart', value=>$initStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'initStop', value=>$initStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'initStart', value=>$initStart}).' '.$i18n->get('and').' '.WebGUI::Form::date($session,{name=>'initStop', value=>$initStop}).'</td>';
 	$output .= '</tr><tr>';
 	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'completion', checked=>($session->form->process("selection") eq 'completion')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('completion date').'</td>';
-	$output .= '<td>'.WebGUI::Form::date($session,{name=>'completionStart', value=>$completionStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'completionStop', value=>$completionStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'completionStart', value=>$completionStart}).' '.$i18n->get('and').' '.WebGUI::Form::date($session,{name=>'completionStop', value=>$completionStop}).'</td>';
 	$output .= '</tr><tr>';
 	$output .= '<td></td>';
 	$output .= '<td align="left">'.$i18n->get('transaction status').'</td>';
@@ -790,7 +790,7 @@ sub www_viewCart {
 
 	foreach (@$normal) {
 		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
-		$_->{'quantity.form'} = WebGUI::Form::integer({
+		$_->{'quantity.form'} = WebGUI::Form::integer($session,{
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
 			size	=> 3,
@@ -799,7 +799,7 @@ sub www_viewCart {
 	}
 	foreach (@$recurring) {
 		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
-		$_->{'quantity.form'} = WebGUI::Form::integer({
+		$_->{'quantity.form'} = WebGUI::Form::integer($session,{
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
 			size	=> 3,
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 4dff4ef1d..f9547ce7a 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -640,11 +640,11 @@ sub www_manageUsersInGroup {
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $i18n = WebGUI::International->new($session);
 	my $output = WebGUI::Form::formHeader($session,)
-		.WebGUI::Form::hidden({
+		.WebGUI::Form::hidden($session,{
 			name=>"gid",
 			value=>$session->form->process("gid")
 			})
-		.WebGUI::Form::hidden({
+		.WebGUI::Form::hidden($session,{
 			name=>"op",
 			value=>"deleteGrouping"
 			});
@@ -658,7 +658,7 @@ sub www_manageUsersInGroup {
                 order by users.username");
 	foreach my $row (@{$p->getPageData}) {
                 $output .= '<tr><td>'
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($session,{
 				name=>"uid",
 				value=>$row->{userId}
 				})
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index 7da80345c..fa16685e3 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -523,12 +523,12 @@ sub www_listProductVariants {
 	%parameters = map {$_->{parameterId} => $_->{name}} sort {$a->{name} <=> $b->{name}} @{$product->getParameter};
 	%options = map {$_->{optionId} => $_->{value}} @{$product->getOption};
 
-	$output = WebGUI::Form::formHeader;
-	$output .= WebGUI::Form::hidden({
+	$output = WebGUI::Form::formHeader($session);
+	$output .= WebGUI::Form::hidden($session,{
 		name	=> 'op',
 		value	=> 'listProductVariantsSave',
 		});
-	$output .= WebGUI::Form::hidden({
+	$output .= WebGUI::Form::hidden($session,{
 		name	=> 'productId',
 		value	=> $productId,
 		});
@@ -552,7 +552,7 @@ sub www_listProductVariants {
 		$output .= '</td><td align="right">'.$_->{weight}."</td><td>";
 		$output .= '*' if ($_->{weightOverride});
 		$output .= "</td>";
-		$output .= "<td>".WebGUI::Form::checkbox({
+		$output .= "<td>".WebGUI::Form::checkbox($session,{
 			name	=> 'available',
 			value	=> $_->{variantId},
 			checked	=> $_->{available},
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index 2a64f6bd5..7988e1a85 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -316,16 +316,16 @@ sub www_listSubscriptionCodes {
 
 	$output .= $i18n->get('selection message');
 	
-	$output .= WebGUI::Form::formHeader;
+	$output .= WebGUI::Form::formHeader($session);
 	$output .= WebGUI::Form::hidden($session,{name=>'op', value=>'listSubscriptionCodes'});
 	$output .= '<table>';
 	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'du', checked=>($session->form->process("selection") eq 'du')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection used').'</td>';
-	$output .= '<td>'.WebGUI::Form::date($session,{name=>'duStart', value=>$duStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'duStop', value=>$duStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'duStart', value=>$duStart}).' '.$i18n->get('and').' '.WebGUI::Form::date($session,{name=>'duStop', value=>$duStop}).'</td>';
 	$output .= '</tr><tr>';
 	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'dc', checked=>($session->form->process("selection") eq 'dc')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection created').'</td>';
-	$output .= '<td>'.WebGUI::Form::date($session,{name=>'dcStart', value=>$dcStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'dcStop', value=>$dcStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'dcStart', value=>$dcStart}).' '.$i18n->get('and').' '.WebGUI::Form::date($session,{name=>'dcStop', value=>$dcStop}).'</td>';
 	$output .= '</tr><tr>';
 	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'b', checked=>($session->form->process("selection") eq 'b')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection batch id').'</td>';