diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 4ae15b646..bbafc7c2b 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -52,7 +52,7 @@ sub _createField {
 	if (isIn($data->{type},qw(selectList checkList))) {
 		my @defaultValues;
 		if ($session{form}{$param{name}}) {
-                	@defaultValues = $session{cgi}->param($param{name});
+                	@defaultValues = $session{req}->param($param{name});
                 } else {
                 	foreach (split(/\n/, $data->{value})) {
                         	s/\s+$//; # remove trailing spaces
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 75ffcc9ad..d6f5e8547 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -245,7 +245,7 @@ sub view {
    	 next if ($input_name !~ /^HttpProxy_/); # Skip non proxied form var's
    	 $input_name =~ s/^HttpProxy_//;
    
-            my $uploadFile = $session{cgi}->tmpFileName($session{form}{'HttpProxy_'.$input_name});
+            my $uploadFile = $session{req}->tmpFileName($session{form}{'HttpProxy_'.$input_name});
             if(-r $uploadFile) { # Found uploaded file
       	       @formUpload=($uploadFile, qq/$session{form}{'HttpProxy_'.$input_name}/);
    	       $formdata{$input_name}=\@formUpload;
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index e7552232d..688ea872a 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -258,9 +258,9 @@ sub view {
 
 		# Deal with pagination
 		my $url = "query=".WebGUI::URL::escape($var{query});
-		map {$url .= "&users=".WebGUI::URL::escape($_)} $session{cgi}->param('users');
-		map {$url .= "&namespaces=".WebGUI::URL::escape($_)} $session{cgi}->param('namespaces');
-		map {$url .= "&contentTypes=".WebGUI::URL::escape($_)} $session{cgi}->param('contentTypes');
+		map {$url .= "&users=".WebGUI::URL::escape($_)} $session{req}->param('users');
+		map {$url .= "&namespaces=".WebGUI::URL::escape($_)} $session{req}->param('namespaces');
+		map {$url .= "&contentTypes=".WebGUI::URL::escape($_)} $session{req}->param('contentTypes');
 		$url .= "&paginateAfter=".$self->getValue("paginateAfter");
 		my $p = WebGUI::Paginator->new(WebGUI::URL::page($url), $self->getValue("paginateAfter"));
 		$p->setDataByArrayRef($results);
@@ -293,8 +293,8 @@ sub view {
 	my $namespaces = $self->_getNamespaces('restricted');
 	foreach(keys %$namespaces) {
 		my $selected = 0;
-		if (scalar $session{cgi}->param('namespaces')) {
-			$selected = isIn($_, $session{cgi}->param('namespaces'));
+		if (scalar $session{req}->param('namespaces')) {
+			$selected = isIn($_, $session{req}->param('namespaces'));
 		} else {
 			$selected = ($session{form}{namespaces} =~ /$_/);
 		}
@@ -311,8 +311,8 @@ sub view {
 	my $contentTypes = $self->_getContentTypes('restricted');
 	foreach(keys %$contentTypes) {
 		my $selected = 0;
-		if (scalar $session{cgi}->param('contentTypes')) {
-			$selected = isIn($_, $session{cgi}->param('contentTypes'));
+		if (scalar $session{req}->param('contentTypes')) {
+			$selected = isIn($_, $session{req}->param('contentTypes'));
 		} else {
 			$selected = ($session{form}{contentTypes} =~ /$_/);
 		}
@@ -335,8 +335,8 @@ sub view {
 	my $users = $self->_getUsers('restricted');
 	foreach(keys %$users) {
 		my $selected = 0;
-		if (scalar $session{cgi}->param('users')) {
-			$selected = isIn($_, $session{cgi}->param('users'));
+		if (scalar $session{req}->param('users')) {
+			$selected = isIn($_, $session{req}->param('users'));
 		} else {
 			$selected = ($session{form}{users} =~ /$_/);
 		}
@@ -346,7 +346,7 @@ sub view {
 	# Create a loop with searchable page roots
 	my $rootData;
 	my @roots = split(/\n/, $self->get('searchRoot'));
-	my %checked = map {$_=>1} $session{cgi}->param("searchRoot");
+	my %checked = map {$_=>1} $session{req}->param("searchRoot");
 	#if (isIn('any', @roots)) {
 	#	foreach $rootData (WebGUI::Page->getAnonymousRoot->daughters) {
 	#		push (@{$var{searchRoots}}, {
@@ -402,7 +402,7 @@ sub _buildPageList {
 	my ($self, @userSpecifiedRoots, @roots, @allowedRoots, $pageId, @pages);
 	$self = shift;
 
-	@userSpecifiedRoots = $session{cgi}->param("searchRoot");
+	@userSpecifiedRoots = $session{req}->param("searchRoot");
 	
 	if ((scalar(@userSpecifiedRoots) == 0)
 		|| ($self->getValue("forceSearchRoots"))
@@ -438,11 +438,11 @@ sub _buildFilter {
 #	}
 
 	# content-types
-	if($session{form}{contentTypes} && ! isIn('any', $session{cgi}->param('contentTypes'))) {
-		$filter{contentType} = [ $session{cgi}->param('contentTypes') ];
+	if($session{form}{contentTypes} && ! isIn('any', $session{req}->param('contentTypes'))) {
+		$filter{contentType} = [ $session{req}->param('contentTypes') ];
 
 		# contentType "content" is a shortcut for "page", "wobject" and "wobjectDetail"
-		if (isIn('content', $session{cgi}->param('contentTypes'))) {
+		if (isIn('content', $session{req}->param('contentTypes'))) {
 			push(@{$filter{contentType}}, qw/Asset assetDetail/);
 		}
 	} elsif ($self->getValue('contentTypes') !~ /any/i) {
@@ -450,9 +450,9 @@ sub _buildFilter {
 	}
 
 	# users
-	if($session{form}{users} && ! isIn('any', $session{cgi}->param('users'))) {
+	if($session{form}{users} && ! isIn('any', $session{req}->param('users'))) {
 		$filter{ownerId} = [];
-		foreach my $user ($session{cgi}->param('users')) {
+		foreach my $user ($session{req}->param('users')) {
 			if ($user =~ /\D/) {
 				$user =~ s/\*/%/g;
 				($user) = WebGUI::SQL->buildArray("select userId from users where username like ".quote($user));
@@ -464,8 +464,8 @@ sub _buildFilter {
 	}
 
 	# namespaces
-	if($session{form}{namespaces} && ! isIn('any', $session{cgi}->param('namespaces'))) {
-		$filter{namespace} = [ $session{cgi}->param('namespaces') ];
+	if($session{form}{namespaces} && ! isIn('any', $session{req}->param('namespaces'))) {
+		$filter{namespace} = [ $session{req}->param('namespaces') ];
 	} elsif ($self->getValue('namespaces') !~ /any/i) {
 		$filter{namespace} = [ split(/\n/, $self->getValue('namespaces')) ];
 	}
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 8fd047c3f..f5385f75f 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -188,7 +188,7 @@ Copies to clipboard assets in a list, then returns self calling method www_manag
 sub www_copyList {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	foreach my $assetId ($session{cgi}->param("assetId")) {
+	foreach my $assetId ($session{req}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
 			my $newAsset = $asset->duplicate;
@@ -258,7 +258,7 @@ Cuts assets in a list (removes to clipboard), then returns self calling method w
 sub www_cutList {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	foreach my $assetId ($session{cgi}->param("assetId")) {
+	foreach my $assetId ($session{req}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
 			$asset->cut;
@@ -384,7 +384,7 @@ Returns a www_manageAssets() method. Pastes a selection of assets. If canEdit is
 sub www_pasteList {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	foreach my $clipId ($session{cgi}->param("assetId")) {
+	foreach my $clipId ($session{req}->param("assetId")) {
 		$self->paste($clipId);
 	}
 	return $self->www_manageAssets();
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 5fb237ff2..29a61dbc8 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -160,7 +160,7 @@ Moves list of assets to trash, returns www_manageAssets() method of self if canE
 sub www_deleteList {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	foreach my $assetId ($session{cgi}->param("assetId")) {
+	foreach my $assetId ($session{req}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
 			$asset->trash;
@@ -245,7 +245,7 @@ Restores a piece of content from the trash back to it's original location.
 sub www_restoreList {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
-        foreach my $id ($session{cgi}->param("assetId")) {
+        foreach my $id ($session{req}->param("assetId")) {
                 my $asset = WebGUI::Asset->newByDynamicClass($id);
                 $asset->publish;
         }
diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index b1435bf77..200fec142 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -104,7 +104,7 @@ Returns an array or a carriage return ("\n") separated scalar depending upon whe
 
 sub getValueFromPost {
 	my $self = shift;
-	my @data = $session{cgi}->param($self->{name});
+	my @data = $session{req}->param($self->{name});
         return wantarray ? @data : join("\n",@data);
 }
 
diff --git a/lib/WebGUI/Form/Checkbox.pm b/lib/WebGUI/Form/Checkbox.pm
index 31ab3ff9f..32b49dbc1 100644
--- a/lib/WebGUI/Form/Checkbox.pm
+++ b/lib/WebGUI/Form/Checkbox.pm
@@ -107,7 +107,7 @@ Retrieves a value from a form GET or POST and returns it. If the value comes bac
 
 sub getValueFromPost {
 	my $self = shift;
-	my $formValue = $session{cgi}->param($self->{name});
+	my $formValue = $session{req}->param($self->{name});
 	if (defined $formValue) {
 		return $formValue;
 	} else {
diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm
index 3b3f637b8..628f3e5c8 100644
--- a/lib/WebGUI/Form/Color.pm
+++ b/lib/WebGUI/Form/Color.pm
@@ -61,7 +61,7 @@ Returns a hex color like "#000000". Returns undef if the return value is not a v
 
 sub getValueFromPost {
 	my $self = shift;
-	my $color = $session{cgi}->param($self->{name});
+	my $color = $session{req}->param($self->{name});
         return undef unless $color =~ /\#\w{6}/;
         return $color;
 }
diff --git a/lib/WebGUI/Form/Combo.pm b/lib/WebGUI/Form/Combo.pm
index fcc99ea13..2b7d25a6e 100644
--- a/lib/WebGUI/Form/Combo.pm
+++ b/lib/WebGUI/Form/Combo.pm
@@ -62,8 +62,8 @@ Returns an array or a carriage return ("\n") separated scalar depending upon whe
 
 sub getValueFromPost {
 	my $self = shift;
-	if ($session{cgi}->param($self->{name}."_new")) {
-		return $session{cgi}->param($self->{name}."_new");
+	if ($session{req}->param($self->{name}."_new")) {
+		return $session{req}->param($self->{name}."_new");
         }
 	return $self->SUPER::getValueFromPost;
 }
diff --git a/lib/WebGUI/Form/ContentType.pm b/lib/WebGUI/Form/ContentType.pm
index c9166b143..fb239af8e 100644
--- a/lib/WebGUI/Form/ContentType.pm
+++ b/lib/WebGUI/Form/ContentType.pm
@@ -103,7 +103,7 @@ Returns either what's posted or if nothing comes back it returns "mixed".
 
 sub getValueFromPost {
 	my $self = shift;
-	return $session{cgi}->param($self->{name}) || "mixed";
+	return $session{req}->param($self->{name}) || "mixed";
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index 809fbbf3a..6f84aa84a 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -306,7 +306,7 @@ Retrieves a value from a form GET or POST and returns it. If the value comes bac
 
 sub getValueFromPost {
 	my $self = shift;
-	my $formValue = $session{cgi}->param($self->{name});
+	my $formValue = $session{req}->param($self->{name});
 	if (defined $formValue) {
 		return $formValue;
 	} else {
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index 5e99b6171..7cea0ca46 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -112,7 +112,7 @@ Returns a validated form post result. If the result does not pass validation, it
 
 sub getValueFromPost {
 	my $self = shift;
-	return WebGUI::DateTime::setToEpoch($session{cgi}->param($self->{name}));
+	return WebGUI::DateTime::setToEpoch($session{req}->param($self->{name}));
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index e1cd97221..f14b6a169 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -104,7 +104,7 @@ Returns a validated form post result. If the result does not pass validation, it
 
 sub getValueFromPost {
 	my $self = shift;
-	return WebGUI::DateTime::setToEpoch($session{cgi}->param($self->{name}));
+	return WebGUI::DateTime::setToEpoch($session{req}->param($self->{name}));
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Email.pm b/lib/WebGUI/Form/Email.pm
index eb64265ea..c0cc473d9 100644
--- a/lib/WebGUI/Form/Email.pm
+++ b/lib/WebGUI/Form/Email.pm
@@ -61,7 +61,7 @@ Returns a validated email address. If the result does not pass validation, it re
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
    	if ($value =~ /^([A-Z0-9]+[._+-]?){1,}([A-Z0-9]+[_+-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
                 return $value;
         }
diff --git a/lib/WebGUI/Form/FieldType.pm b/lib/WebGUI/Form/FieldType.pm
index 4401d7c85..d19cd7ea7 100644
--- a/lib/WebGUI/Form/FieldType.pm
+++ b/lib/WebGUI/Form/FieldType.pm
@@ -124,7 +124,7 @@ Returns either what's posted or if nothing comes back it returns "text".
 
 sub getValueFromPost {
         my $self = shift;
-        return $session{cgi}->param($self->{name}) || "text";
+        return $session{req}->param($self->{name}) || "text";
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/FilterContent.pm b/lib/WebGUI/Form/FilterContent.pm
index 4d7262f76..b75ce6a69 100644
--- a/lib/WebGUI/Form/FilterContent.pm
+++ b/lib/WebGUI/Form/FilterContent.pm
@@ -104,7 +104,7 @@ Returns either what's posted or if nothing comes back it returns "most".
 
 sub getValueFromPost {
 	my $self = shift;
-	return $session{cgi}->param($self->{name}) || "most";
+	return $session{req}->param($self->{name}) || "most";
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 09d7a3816..ecd5f7165 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -103,7 +103,7 @@ Returns the integer from the form post, or returns 0.0 if the post result is inv
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
 	if ($value =~ /^[\d\-\.]+$/) {
                 return $value;
         }
diff --git a/lib/WebGUI/Form/Group.pm b/lib/WebGUI/Form/Group.pm
index c0bf288ac..8844f52db 100644
--- a/lib/WebGUI/Form/Group.pm
+++ b/lib/WebGUI/Form/Group.pm
@@ -121,7 +121,7 @@ Returns either what's posted or if nothing comes back it returns "2" the ID of t
 
 sub getValueFromPost {
 	my $self = shift;
-        my @data = $session{cgi}->param($self->{name});
+        my @data = $session{req}->param($self->{name});
         if (scalar(@data)) {
 		return wantarray ? @data : join("\n",@data);
 	}
diff --git a/lib/WebGUI/Form/Integer.pm b/lib/WebGUI/Form/Integer.pm
index 295b32db5..cfe9d7a5f 100644
--- a/lib/WebGUI/Form/Integer.pm
+++ b/lib/WebGUI/Form/Integer.pm
@@ -103,7 +103,7 @@ Returns the integer from the form post, or returns 0 if the post result is inval
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
 	if ($value =~ /^[\d\-]+$/) {
                 return $value;
         }
diff --git a/lib/WebGUI/Form/Interval.pm b/lib/WebGUI/Form/Interval.pm
index 20c31442e..73295724c 100644
--- a/lib/WebGUI/Form/Interval.pm
+++ b/lib/WebGUI/Form/Interval.pm
@@ -94,7 +94,7 @@ Returns either the interval that was posted (in seconds) or if nothing comes bac
 
 sub getValueFromPost {
 	my $self = shift;
-	return WebGUI::DateTime::intervalToSeconds($session{cgi}->param($self->{name}."_interval"),$session{cgi}->param($self->{name}."_units")) || 0;
+	return WebGUI::DateTime::intervalToSeconds($session{req}->param($self->{name}."_interval"),$session{req}->param($self->{name}."_units")) || 0;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/LdapLink.pm b/lib/WebGUI/Form/LdapLink.pm
index eb06067a2..663e7dd13 100644
--- a/lib/WebGUI/Form/LdapLink.pm
+++ b/lib/WebGUI/Form/LdapLink.pm
@@ -127,7 +127,7 @@ Returns an array or a carriage return ("\n") separated scalar depending upon whe
 
 sub getValueFromPost {
         my $self = shift;
-        my @data = $session{cgi}->param($self->{name});
+        my @data = $session{req}->param($self->{name});
         return wantarray ? @data : join("\n",@data);
 }
 
diff --git a/lib/WebGUI/Form/Phone.pm b/lib/WebGUI/Form/Phone.pm
index c8017a77b..7fd16cc4d 100644
--- a/lib/WebGUI/Form/Phone.pm
+++ b/lib/WebGUI/Form/Phone.pm
@@ -61,7 +61,7 @@ Returns a string filtered to allow only digits, spaces, and these special charac
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
    	if ($value =~ /^[\d\s\-\+\(\)]+$/) {
                 return $value;
         }
diff --git a/lib/WebGUI/Form/SelectList.pm b/lib/WebGUI/Form/SelectList.pm
index 5e9794449..ff0289a6c 100644
--- a/lib/WebGUI/Form/SelectList.pm
+++ b/lib/WebGUI/Form/SelectList.pm
@@ -117,7 +117,7 @@ Returns an array or a carriage return ("\n") separated scalar depending upon whe
 
 sub getValueFromPost {
 	my $self = shift;
-	my @data = $session{cgi}->param($self->{name});
+	my @data = $session{req}->param($self->{name});
         return wantarray ? @data : join("\n",@data);
 }
 
diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm
index ae876d039..a733fc72f 100644
--- a/lib/WebGUI/Form/TimeField.pm
+++ b/lib/WebGUI/Form/TimeField.pm
@@ -99,7 +99,7 @@ Returns the number of seconds since 00:00:00 on a 24 hour clock. Note, this will
 
 sub getValueFromPost {
 	my $self = shift;
-	return WebGUI::DateTime::timeToSeconds($session{cgi}->param($self->{name}))-($session{user}{timeOffset}*3600);
+	return WebGUI::DateTime::timeToSeconds($session{req}->param($self->{name}))-($session{user}{timeOffset}*3600);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Url.pm b/lib/WebGUI/Form/Url.pm
index 5478a3db9..af86c439c 100644
--- a/lib/WebGUI/Form/Url.pm
+++ b/lib/WebGUI/Form/Url.pm
@@ -89,7 +89,7 @@ Parses the posted value and tries to make corrections if necessary.
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
      	if ($value =~ /mailto:/) {
                 return $value;
         } elsif ($value =~ /^([A-Z0-9]+[._+-]?){1,}([A-Z0-9]+[_+-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
diff --git a/lib/WebGUI/Form/YesNo.pm b/lib/WebGUI/Form/YesNo.pm
index 34cfd48ef..1daf227d8 100644
--- a/lib/WebGUI/Form/YesNo.pm
+++ b/lib/WebGUI/Form/YesNo.pm
@@ -89,7 +89,7 @@ Returns either a 1 or 0 representing yes, no.
 
 sub yesNo {
 	my $self = shift;
-        if ($session{cgi}->param($self->{name}) > 0) {
+        if ($session{req}->param($self->{name}) > 0) {
                 return 1;
         }
 	return 0;
diff --git a/lib/WebGUI/Form/Zipcode.pm b/lib/WebGUI/Form/Zipcode.pm
index 3bbad7134..2290eef11 100644
--- a/lib/WebGUI/Form/Zipcode.pm
+++ b/lib/WebGUI/Form/Zipcode.pm
@@ -89,7 +89,7 @@ Returns a validated form post result. If the result does not pass validation, it
 
 sub getValueFromPost {
 	my $self = shift;
-	my $value = $session{cgi}->param($self->{name});
+	my $value = $session{req}->param($self->{name});
    	if ($value =~ /^[A-Z\d\s\-]+$/) {
                 return $value;
         }
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 7ad7b7022..87a734379 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -158,7 +158,7 @@ sub walkGroups {
 #-------------------------------------------------------------------
 sub www_addGroupsToGroupSave {
         return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid}));
-        my @groups = $session{cgi}->param('groups');
+        my @groups = $session{req}->param('groups');
 	WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]);
         return www_manageGroupsInGroup();
 }
@@ -166,7 +166,7 @@ sub www_addGroupsToGroupSave {
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSave {
         return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid}));
-        my @users = $session{cgi}->param('users');
+        my @users = $session{req}->param('users');
 	WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
         return www_manageUsersInGroup();
 }
@@ -226,8 +226,8 @@ sub www_deleteGrouping {
         if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
                 return WebGUI::Privilege::vitalComponent();
         }
-        my @users = $session{cgi}->param('uid');
-        my @groups = $session{cgi}->param("gid");
+        my @users = $session{req}->param('uid');
+        my @groups = $session{req}->param("gid");
         foreach my $user (@users) {
                 my $u = WebGUI::User->new($user);
                 $u->deleteFromGroups(\@groups);
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index edd1e9d6d..c09b2a2da 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -560,7 +560,7 @@ sub www_listProductVariantsSave {
 
 	return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
 	
-	my %availableVariants = map {$_ => 1} $session{cgi}->param('available');
+	my %availableVariants = map {$_ => 1} $session{req}->param('available');
 
 	my $product = WebGUI::Product->new($session{form}{productId});
 	my @variants = @{$product->getVariant};
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index adabb23aa..1f3ffe88c 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -93,7 +93,7 @@ sub www_createSubscriptionCodeBatch {
 		-options=> \%subscriptions,
 		-multiple=>1,
 		-size	=> 5,
-		-value  => [ ($session{cgi}->param('subscriptionId'))]
+		-value  => [ ($session{req}->param('subscriptionId'))]
 		);
 	$f->textarea(
 		-name	=> 'description',
@@ -136,7 +136,7 @@ sub www_createSubscriptionCodeBatchSave {
 		
 		WebGUI::SQL->write("insert into subscriptionCode (batchId, code, status, dateCreated, dateUsed, expires, usedBy)".
 			" values (".quote($batchId).",".quote($code).", 'Unused', ".quote($creationEpoch).", 0, ".quote($expires).", 0)");
-		@subscriptions = $session{cgi}->param('subscriptionId');
+		@subscriptions = $session{req}->param('subscriptionId');
 		foreach (@subscriptions) {
 			WebGUI::SQL->write("insert into subscriptionCodeSubscriptions (code, subscriptionId) values (".
 				quote($code).", ".quote($_).")");
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 67941179b..48b568bfb 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -169,8 +169,8 @@ sub www_deleteGrouping {
 	if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
 		return _submenu(WebGUI::Privilege::vitalComponent());
         }
-        my @users = $session{cgi}->param('uid');
-	my @groups = $session{cgi}->param("gid");
+        my @users = $session{req}->param('uid');
+	my @groups = $session{req}->param("gid");
 	foreach my $user (@users) {
 		my $u = WebGUI::User->new($user);
 		$u->deleteFromGroups(\@groups);
@@ -323,7 +323,7 @@ sub www_editUser {
                 $previousCategory = $category;
         }
         $a->finish;
-	my @groupsToAdd = $session{cgi}->param("groupsToAdd");
+	my @groupsToAdd = $session{req}->param("groupsToAdd");
 	my @exclude = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($u->userId));
 	@exclude = (@exclude,"1","2","7");
 	$tabform->getTab("groups")->group(
@@ -345,7 +345,7 @@ sub www_editUser {
 		}
 	}
 	push (@include, "0");
-	my @groupsToDelete = $session{cgi}->param("groupsToDelete");
+	my @groupsToDelete = $session{req}->param("groupsToDelete");
 	$tabform->getTab("groups")->selectList(
 		-name=>"groupsToDelete",
 		-options=>WebGUI::SQL->buildHashRef("select groupId, groupName from groups 
@@ -385,9 +385,9 @@ sub www_editUserSave {
                		$u->profileField($field{fieldName},WebGUI::FormProcessor::process($field{fieldName},$field{dataType}));
        		}
        		$a->finish;
-		my @groups = $session{cgi}->param("groupsToAdd");
+		my @groups = $session{req}->param("groupsToAdd");
 		$u->addToGroups(\@groups);
-		@groups = $session{cgi}->param("groupsToDelete");
+		@groups = $session{req}->param("groupsToDelete");
 		$u->deleteFromGroups(\@groups);
 	} else {
        		$error = '<ul><li>'.WebGUI::International::get(77).' '.$session{form}{username}.'Too or '.$session{form}{username}.'02</li></ul>';
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index 5d6958568..b9b18b587 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -199,7 +199,7 @@ sub addFileFromFormPost {
 	return "" if (WebGUI::HTTP::getStatus() =~ /^413/);
 	my $filename;
 	my $attachmentCount = 1;
-        foreach my $tempPath ($session{cgi}->upload($formVariableName)) {
+        foreach my $tempPath ($session{req}->upload($formVariableName)) {
         	last if $attachmentCount > $attachmentLimit;
                 if ($tempPath =~ /([^\/\\]+)$/) {
                         $filename = $1;
diff --git a/www/index.pl b/www/index.pl
index e8851c0da..93933b975 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -13,16 +13,26 @@
 our ($webguiRoot, $configFile);
 
 BEGIN {
-        $configFile = "WebGUI.conf";
+        $configFile = "webgui.conf";
         $webguiRoot = "/data/WebGUI";
         unshift (@INC, $webguiRoot."/lib");
 }
 
 #-----------------DO NOT MODIFY BELOW THIS LINE--------------------
-
-use CGI::Carp qw(fatalsToBrowser);
+#use Devel::Profiler bad_pkgs => [qw(UNIVERSAL Time::HiRes B Carp Exporter Cwd Config CORE DynaLoader XSLoader AutoLoader Safe)];
+#use CGI::Carp qw(fatalsToBrowser);
 use strict;
 use WebGUI;
-
 print WebGUI::page($webguiRoot,$configFile);
 
+#  use Devel::DProfPP;
+#  my $pp = Devel::DProfPP->new;
+#use Data::Dumper;
+#  print Devel::DProfPP->new(
+#        file    => "tmon.out",
+#        enter   => sub { my ($self, $sub_name)  = shift;
+#                         my $frame = ($self->stack)[-1];
+#                         print "\t" x $frame->height, $frame->sub_name;
+#                       }
+#  )->parse;
+#  print Dumper(\%hash);
\ No newline at end of file