From 09483e18c52b13ddaa919c0e88af9e812727b0e9 Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Mon, 16 Jan 2006 22:45:21 +0000
Subject: [PATCH] a ton of $session fixes (thanks to Colin), and a new $session
 checker, that supposedly, shouldn't be needed now.  It can be backed out,
 however, easily.

---
 lib/WebGUI.pm                                 | 20 ++++
 lib/WebGUI/AdminConsole.pm                    |  2 +-
 lib/WebGUI/Affiliate.pm                       |  2 +-
 lib/WebGUI/Asset.pm                           | 20 ++--
 lib/WebGUI/Asset/Event.pm                     |  2 +-
 lib/WebGUI/Asset/File.pm                      |  2 +-
 lib/WebGUI/Asset/File/Image.pm                |  2 +-
 lib/WebGUI/Asset/File/ZipArchive.pm           |  2 +-
 lib/WebGUI/Asset/Post.pm                      |  4 +-
 lib/WebGUI/Asset/Post/Thread.pm               |  2 +-
 lib/WebGUI/Asset/Redirect.pm                  |  2 +-
 lib/WebGUI/Asset/RichEdit.pm                  |  2 +-
 lib/WebGUI/Asset/Shortcut.pm                  |  2 +-
 lib/WebGUI/Asset/Snippet.pm                   |  2 +-
 lib/WebGUI/Asset/Template.pm                  | 66 +------------
 lib/WebGUI/Asset/Wobject.pm                   |  2 +-
 lib/WebGUI/Asset/Wobject/Article.pm           |  2 +-
 lib/WebGUI/Asset/Wobject/Collaboration.pm     |  4 +-
 lib/WebGUI/Asset/Wobject/Dashboard.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/DataForm.pm          |  2 +-
 lib/WebGUI/Asset/Wobject/EventsCalendar.pm    |  2 +-
 lib/WebGUI/Asset/Wobject/Folder.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/HttpProxy.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/InOutBoard.pm        |  2 +-
 lib/WebGUI/Asset/Wobject/IndexedSearch.pm     |  2 +-
 lib/WebGUI/Asset/Wobject/Layout.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/Matrix.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/MessageBoard.pm      |  2 +-
 lib/WebGUI/Asset/Wobject/MultiSearch.pm       |  2 +-
 lib/WebGUI/Asset/Wobject/Navigation.pm        |  2 +-
 lib/WebGUI/Asset/Wobject/Poll.pm              |  2 +-
 lib/WebGUI/Asset/Wobject/Product.pm           |  6 +-
 lib/WebGUI/Asset/Wobject/SQLReport.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/StockData.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/Survey.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/SyndicatedContent.pm |  2 +-
 lib/WebGUI/Asset/Wobject/WSClient.pm          |  2 +-
 lib/WebGUI/Asset/Wobject/WeatherData.pm       |  2 +-
 lib/WebGUI/AssetBranch.pm                     |  4 +-
 lib/WebGUI/AssetLineage.pm                    | 12 +--
 lib/WebGUI/AssetTrash.pm                      |  8 +-
 lib/WebGUI/AssetVersioning.pm                 | 32 +++---
 lib/WebGUI/Auth/LDAP.pm                       |  2 +-
 lib/WebGUI/Auth/WebGUI.pm                     |  4 +-
 lib/WebGUI/Cache.pm                           |  2 +-
 lib/WebGUI/Cache/FileCache.pm                 |  2 +-
 lib/WebGUI/Cache/Memcached.pm                 |  2 +-
 lib/WebGUI/Commerce.pm                        |  2 +-
 lib/WebGUI/Commerce/Item.pm                   |  6 +-
 lib/WebGUI/Commerce/Payment.pm                |  2 +-
 lib/WebGUI/Commerce/Payment/ITransact.pm      |  6 +-
 lib/WebGUI/Commerce/Shipping.pm               |  2 +-
 lib/WebGUI/Commerce/ShoppingCart.pm           |  4 +-
 lib/WebGUI/Commerce/Transaction.pm            |  4 +-
 lib/WebGUI/DatabaseLink.pm                    |  6 +-
 lib/WebGUI/Form.pm                            |  4 +-
 lib/WebGUI/Form/Asset.pm                      |  2 +-
 lib/WebGUI/Form/Button.pm                     |  2 +-
 lib/WebGUI/Form/CheckList.pm                  |  2 +-
 lib/WebGUI/Form/Checkbox.pm                   |  2 +-
 lib/WebGUI/Form/Codearea.pm                   |  2 +-
 lib/WebGUI/Form/Color.pm                      |  2 +-
 lib/WebGUI/Form/Combo.pm                      |  2 +-
 lib/WebGUI/Form/ContentType.pm                |  2 +-
 lib/WebGUI/Form/Control.pm                    |  9 +-
 lib/WebGUI/Form/DatabaseLink.pm               |  2 +-
 lib/WebGUI/Form/Date.pm                       |  4 +-
 lib/WebGUI/Form/DateTime.pm                   |  2 +-
 lib/WebGUI/Form/DynamicField.pm               |  4 +-
 lib/WebGUI/Form/Email.pm                      |  2 +-
 lib/WebGUI/Form/FieldType.pm                  |  4 +-
 lib/WebGUI/Form/File.pm                       |  4 +-
 lib/WebGUI/Form/FilterContent.pm              |  2 +-
 lib/WebGUI/Form/Float.pm                      |  2 +-
 lib/WebGUI/Form/Group.pm                      |  2 +-
 lib/WebGUI/Form/HTMLArea.pm                   |  6 +-
 lib/WebGUI/Form/Hidden.pm                     |  2 +-
 lib/WebGUI/Form/HiddenList.pm                 |  2 +-
 lib/WebGUI/Form/Image.pm                      |  2 +-
 lib/WebGUI/Form/Integer.pm                    |  2 +-
 lib/WebGUI/Form/Interval.pm                   |  2 +-
 lib/WebGUI/Form/LdapLink.pm                   |  2 +-
 lib/WebGUI/Form/List.pm                       |  2 +-
 lib/WebGUI/Form/Password.pm                   |  2 +-
 lib/WebGUI/Form/Phone.pm                      |  2 +-
 lib/WebGUI/Form/Radio.pm                      |  2 +-
 lib/WebGUI/Form/RadioList.pm                  |  2 +-
 lib/WebGUI/Form/ReadOnly.pm                   |  2 +-
 lib/WebGUI/Form/SelectBox.pm                  |  2 +-
 lib/WebGUI/Form/SelectList.pm                 |  2 +-
 lib/WebGUI/Form/Submit.pm                     |  2 +-
 lib/WebGUI/Form/Template.pm                   |  4 +-
 lib/WebGUI/Form/Text.pm                       |  2 +-
 lib/WebGUI/Form/Textarea.pm                   |  2 +-
 lib/WebGUI/Form/TimeField.pm                  |  3 +-
 lib/WebGUI/Form/TimeZone.pm                   |  2 +-
 lib/WebGUI/Form/Url.pm                        |  2 +-
 lib/WebGUI/Form/WhatNext.pm                   |  2 +-
 lib/WebGUI/Form/YesNo.pm                      |  2 +-
 lib/WebGUI/Form/Zipcode.pm                    |  2 +-
 lib/WebGUI/Group.pm                           |  2 +-
 lib/WebGUI/HTML.pm                            |  4 +-
 lib/WebGUI/HTMLForm.pm                        |  2 +-
 lib/WebGUI/Help/Macros.pm                     |  2 +-
 lib/WebGUI/International.pm                   | 18 ++--
 lib/WebGUI/LDAPLink.pm                        |  4 +-
 lib/WebGUI/Macro.pm                           |  2 +-
 lib/WebGUI/Macro/AOIHits.pm                   |  2 +-
 lib/WebGUI/Macro/AOIRank.pm                   |  2 +-
 lib/WebGUI/Macro/AdminBar.pm                  |  2 +-
 lib/WebGUI/Macro/AdminText.pm                 |  2 +-
 lib/WebGUI/Macro/AdminToggle.pm               |  2 +-
 lib/WebGUI/Macro/AssetProxy.pm                |  2 +-
 lib/WebGUI/Macro/At_username.pm               |  2 +-
 lib/WebGUI/Macro/CanEditText.pm               |  2 +-
 lib/WebGUI/Macro/D_date.pm                    |  2 +-
 lib/WebGUI/Macro/EditableToggle.pm            |  2 +-
 lib/WebGUI/Macro/Env.pm                       |  2 +-
 lib/WebGUI/Macro/Execute.pm                   |  2 +-
 lib/WebGUI/Macro/Extras.pm                    |  2 +-
 lib/WebGUI/Macro/FetchMimeType.pm             |  2 +-
 lib/WebGUI/Macro/FileUrl.pm                   |  2 +-
 lib/WebGUI/Macro/FormParam.pm                 |  2 +-
 lib/WebGUI/Macro/GroupAdd.pm                  |  2 +-
 lib/WebGUI/Macro/GroupDelete.pm               |  2 +-
 lib/WebGUI/Macro/GroupText.pm                 |  2 +-
 lib/WebGUI/Macro/H_homeLink.pm                |  2 +-
 lib/WebGUI/Macro/Hash_userId.pm               |  2 +-
 lib/WebGUI/Macro/Include.pm                   |  2 +-
 lib/WebGUI/Macro/JavaScript.pm                |  2 +-
 lib/WebGUI/Macro/L_loginBox.pm                |  4 +-
 lib/WebGUI/Macro/LastModified.pm              |  2 +-
 lib/WebGUI/Macro/LoginToggle.pm               |  2 +-
 lib/WebGUI/Macro/Page.pm                      |  2 +-
 lib/WebGUI/Macro/PageTitle.pm                 |  2 +-
 lib/WebGUI/Macro/PageUrl.pm                   |  2 +-
 lib/WebGUI/Macro/Product.pm                   |  2 +-
 lib/WebGUI/Macro/Quote.pm                     |  2 +-
 lib/WebGUI/Macro/RandomAssetProxy.pm          |  2 +-
 lib/WebGUI/Macro/RandomThread.pm              |  4 +-
 lib/WebGUI/Macro/RawHeadTags.pm               |  2 +-
 lib/WebGUI/Macro/RootTitle.pm                 |  2 +-
 lib/WebGUI/Macro/SQL.pm                       |  2 +-
 lib/WebGUI/Macro/Slash_gatewayUrl.pm          |  2 +-
 lib/WebGUI/Macro/Spacer.pm                    |  2 +-
 lib/WebGUI/Macro/Splat_random.pm              |  2 +-
 lib/WebGUI/Macro/StyleSheet.pm                |  2 +-
 lib/WebGUI/Macro/SubscriptionItem.pm          |  2 +-
 .../Macro/SubscriptionItemPurchaseUrl.pm      |  2 +-
 lib/WebGUI/Macro/Thumbnail.pm                 |  2 +-
 lib/WebGUI/Macro/URLEncode.pm                 |  2 +-
 lib/WebGUI/Macro/User.pm                      |  2 +-
 lib/WebGUI/Macro/a_account.pm                 |  2 +-
 lib/WebGUI/Macro/c_companyName.pm             |  2 +-
 lib/WebGUI/Macro/e_companyEmail.pm            |  2 +-
 lib/WebGUI/Macro/r_printable.pm               |  2 +-
 lib/WebGUI/Macro/u_companyUrl.pm              |  2 +-
 lib/WebGUI/Operation.pm                       |  2 +-
 lib/WebGUI/Operation/ActiveSessions.pm        |  4 +-
 lib/WebGUI/Operation/Admin.pm                 |  8 +-
 lib/WebGUI/Operation/Auth.pm                  |  4 +-
 lib/WebGUI/Operation/Cache.pm                 |  6 +-
 lib/WebGUI/Operation/Commerce.pm              | 52 +++++-----
 lib/WebGUI/Operation/DatabaseLink.pm          | 14 +--
 lib/WebGUI/Operation/FormHelpers.pm           | 16 +--
 lib/WebGUI/Operation/Group.pm                 | 98 +++++++++----------
 lib/WebGUI/Operation/Help.pm                  | 22 ++---
 lib/WebGUI/Operation/LDAPLink.pm              | 12 +--
 lib/WebGUI/Operation/LoginHistory.pm          |  2 +-
 lib/WebGUI/Operation/MessageLog.pm            |  6 +-
 lib/WebGUI/Operation/ProductManager.pm        | 36 +++----
 lib/WebGUI/Operation/Profile.pm               | 14 +--
 lib/WebGUI/Operation/ProfileSettings.pm       | 26 ++---
 lib/WebGUI/Operation/Replacements.pm          | 10 +-
 lib/WebGUI/Operation/Scratch.pm               |  4 +-
 lib/WebGUI/Operation/Settings.pm              |  4 +-
 lib/WebGUI/Operation/Shared.pm                |  4 +-
 lib/WebGUI/Operation/Statistics.pm            |  4 +-
 lib/WebGUI/Operation/Style.pm                 |  6 +-
 lib/WebGUI/Operation/Subscription.pm          | 28 +++---
 lib/WebGUI/Operation/TransactionLog.pm        |  8 +-
 lib/WebGUI/Operation/User.pm                  | 22 ++---
 lib/WebGUI/Operation/WebGUI.pm                |  8 +-
 lib/WebGUI/Paginator.pm                       |  2 +-
 lib/WebGUI/PassiveProfiling.pm                |  6 +-
 lib/WebGUI/Product.pm                         |  8 +-
 lib/WebGUI/ProfileCategory.pm                 |  4 +-
 lib/WebGUI/ProfileField.pm                    | 10 +-
 lib/WebGUI/SQL.pm                             |  2 +-
 lib/WebGUI/Session.pm                         |  1 -
 lib/WebGUI/Session/DateTime.pm                |  2 +-
 lib/WebGUI/Session/ErrorHandler.pm            |  2 +-
 lib/WebGUI/Session/Form.pm                    |  4 +-
 lib/WebGUI/Session/Http.pm                    |  2 +-
 lib/WebGUI/Session/Icon.pm                    |  2 +-
 lib/WebGUI/Session/Id.pm                      |  2 +-
 lib/WebGUI/Session/Privilege.pm               |  2 +-
 lib/WebGUI/Session/Scratch.pm                 |  2 +-
 lib/WebGUI/Session/Setting.pm                 |  2 +-
 lib/WebGUI/Session/Stow.pm                    |  2 +-
 lib/WebGUI/Session/Style.pm                   |  2 +-
 lib/WebGUI/Session/Url.pm                     |  2 +-
 lib/WebGUI/Session/Var.pm                     |  2 +-
 lib/WebGUI/Storage.pm                         |  6 +-
 lib/WebGUI/Subscription.pm                    |  4 +-
 lib/WebGUI/TabForm.pm                         |  2 +-
 lib/WebGUI/User.pm                            |  6 +-
 sbin/preload.perl                             |  3 +
 208 files changed, 505 insertions(+), 533 deletions(-)

diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index d6c8df0b1..c63caf426 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -218,6 +218,26 @@ sub upgrading {
 }
 
 
+sub dumpSession {
+	my $session = shift;
+	if ($session) {
+		if (ref $session eq 'WebGUI::Session') {
+			return;
+		} else {
+			use Data::Dumper; print '<html><body><pre>$session is '.Dumper($session).' (not a WebGUI::Session!) at ';
+		}
+	} else {
+		print '<html><body><pre>$session is empty at ';
+	}
+	my $i = 1;
+	my $output;
+	while (my @data = caller($i)) {
+		print "\t".join(",",@data)."\n";
+		$i++;
+	}
+	print '</pre></body></html>';
+	exit;
+}
 
 1;
 
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index efdf6d6c4..360778e65 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -368,7 +368,7 @@ If supplied, updates the _function of the AdminFunction.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = shift;
 	my %self;
 	$self{_function} = $class->getAdminFunction($id) if ($id);
diff --git a/lib/WebGUI/Affiliate.pm b/lib/WebGUI/Affiliate.pm
index 5504e9fb5..042224ec5 100644
--- a/lib/WebGUI/Affiliate.pm
+++ b/lib/WebGUI/Affiliate.pm
@@ -49,7 +49,7 @@ A reference to the current session.
 =cut
 
 sub grabReferral {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->user->userId ne "1" && $session->user->referringAffiliate) {
 		return "";
 	} elsif ($session->user->userId ne "1" && (($session->user->referringAffiliate eq "0" && $session->scratch->process("referringAffiliate")) || $session->form->process("affiliateId"))) {
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 46697977a..bb744f557 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -76,7 +76,7 @@ Only developers extending this method should use this parameter. By default WebG
 
 sub canAdd {
 	my $className = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $userId = shift || $session->user->userId;
 	my $subclassGroupId = shift;
 	my $groupId = $session->config->get("assetAddPrivilege")->{$className} || $subclassGroupId || '12';
@@ -150,7 +150,7 @@ An array reference containing additional information to include with the default
 
 sub definition {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, "Asset");
         push(@{$definition}, {
@@ -466,7 +466,7 @@ A reference to the current session.
 
 sub getDefault {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $class->newByDynamicClass($session, $session->setting->get("defaultPage"));
 }
 
@@ -733,7 +733,7 @@ A reference to the current session.
 
 sub getImportNode {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return WebGUI::Asset->newByDynamicClass($session, "PBasset000000000000002");
 }
 
@@ -797,7 +797,7 @@ A reference to the current session.
 
 sub getNotFound {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->url->getRequestedUrl eq "*give-credit-where-credit-is-due*") {
 		my $content = "";
 		open(FILE,"<".$session->config->getWebguiRoot."/docs/credits.txt");
@@ -834,7 +834,7 @@ A reference to the current session.
 
 sub getRoot {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return WebGUI::Asset->new($session, "PBasset000000000000001");
 }
 
@@ -1008,7 +1008,7 @@ An epoch date that represents a specific version of an asset. By default the mos
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $assetId = shift;
 	return undef unless ($assetId);
 	my $className = shift;
@@ -1077,7 +1077,7 @@ A specific revision date for the asset to retrieve. If not specified, the most r
 
 sub newByDynamicClass {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $assetId = shift;
 	my $revisionDate = shift;
 	return undef unless defined $assetId;
@@ -1111,7 +1111,7 @@ A properties hash reference. The className of the properties hash must be valid.
 
 sub newByPropertyHashRef {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $properties = shift;
 	return undef unless defined $properties;
 	return undef unless exists $properties->{className};
@@ -1144,7 +1144,7 @@ A specific revision to instanciate. By default we instanciate the newest publish
 
 sub newByUrl {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $url = shift || $session->url->getRequestedUrl;
 	my $revisionDate = shift;
 	$url = lc($url);
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index f0bbdf717..3ba3c836c 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -25,7 +25,7 @@ our @ISA = qw(WebGUI::Asset);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
   my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Event");
   push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index a20e4954a..56cea1d5b 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -75,7 +75,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_File");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index b3e19fc8c..50b249608 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -60,7 +60,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Image");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index 6333c62df..d1f607105 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -103,7 +103,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
    my $class = shift;
-   my $session = shift;
+   my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_ZipArchive");
    push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 24650b752..6ba769a34 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -53,7 +53,7 @@ sub addRevision {
 #-------------------------------------------------------------------
 sub canAdd {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$class->SUPER::canAdd($session, undef, '7');
 }
 
@@ -103,7 +103,7 @@ sub chopTitle {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Post");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index 16c0f95f2..ca54433e4 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -67,7 +67,7 @@ sub decrementReplies {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Thread");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index 9779ebe31..f0acaa3f6 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -56,7 +56,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Redirect");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 326378531..5dc400ccb 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -58,7 +58,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_RichEdit');
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 44379b5c4..e126386e6 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -155,7 +155,7 @@ sub canManage {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Shortcut");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index 8b1427d69..ed6445b3a 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -57,7 +57,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Snippet");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index e61e898d6..e7446704f 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -43,19 +43,9 @@ These methods are available from this class:
 =cut
 
 
-#-------------------------------------------------------------------
-sub _getTemplateFile {
-	my $templateId = shift;
-	my $filename = $templateId.".tmpl";
-	$filename =~ s/\//-/g;
-	$filename =~ s/ /-/g;
-	return WebGUI::Attachment->new($filename,"temp","templates");
-}
-
-
 #-------------------------------------------------------------------
 sub _execute {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $params = shift;
 	my $vars = shift;
 	my $t;
@@ -97,7 +87,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session, 'Asset_Template');
         push(@{$definition}, {
@@ -201,7 +191,7 @@ Specify the namespace to build the list for.
 
 sub getList {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $namespace = shift;
 my $sql = "select asset.assetId, assetData.revisionDate from template left join asset on asset.assetId=template.assetId left join assetData on assetData.revisionDate=template.revisionDate and assetData.assetId=template.assetId where template.namespace=".$session->db->quote($namespace)." and template.showInForms=1 and asset.state='published' and assetData.revisionDate=(SELECT max(revisionDate) from assetData where assetData.assetId=asset.assetId and (assetData.status='approved' or assetData.tagId=".$session->db->quote($session->scratch->get("versionTag")).")) order by assetData.title";
 	my $sth = $session->dbSlave->read($sql);
@@ -232,57 +222,9 @@ sub process {
 	my $self = shift;
 	my $vars = shift;
 	return $self->processRaw($self->session, $self->get("template"),$vars);
-# skip all the junk below here for now until we have time to bring it inline with the new system
-	my $file = _getTemplateFile($self->get("templateId"));
-	my $fileCacheDir = $self->session->config->get("uploadsPath").'/temp/templatecache';
-	my %params = (
-		filename=>$file->getPath,
-		global_vars=>1,
-   		loop_context_vars=>1,
-		die_on_bad_params=>0,
-		no_includes=>1,
-		file_cache_dir=>$fileCacheDir,
-		strict=>0
-		);
-	my $error=0;
-        if ($self->session->config->get("templateCacheType") =~ /file/) {
-                eval { mkpath($fileCacheDir) };
-                if($@) {
-                        $self->session->errorHandler->error("Could not create dir $fileCacheDir: $@\nTemplate file caching disabled");
-			$error++;
-		}
-		if(not -w $fileCacheDir) {
-			$self->session->errorHandler->error("Directory $fileCacheDir is not writable. Template file caching is disabled");
-			$error++;
-		}
-	}
-	if ($self->session->config->get("templateCacheType") eq "file" && not $error) {
-	# disabled until we can figure out what's wrong with it
-	#	$params{file_cache} = 1;
-	} elsif ($self->session->config->get("templateCacheType") eq "memory") {
-		$params{cache} = 1;
-	} elsif ($self->session->config->get("templateCacheType") eq "ipc") {
-		$params{shared_cache} = 1;
-	} elsif ($self->session->config->get("templateCacheType") eq "memory-ipc") {
-		$params{double_cache} = 1;
-	} elsif ($self->session->config->get("templateCacheType") eq "memory-file" && not $error) {
-		$params{double_file_cache} = 1;
-	}
-	my $template;
-	unless (-e $file->getPath) {
-		$file->saveFromScalar($self->get("template"));
-		unless (-e $file->getPath) {
-	                $self->session->errorHandler->error("Could not create file ".$file->getPath."\nTemplate file caching is disabled");
-        	        $params{scalarref} = \$template;
-			delete $params{filename};
-        	}
-	}
-	return _execute($self->session, \%params,$vars);
 }
 
 
-
-
 #-------------------------------------------------------------------
 
 =head2 processRaw ( template, vars )
@@ -307,7 +249,7 @@ A hash reference containing template variables and loops. Automatically includes
 
 sub processRaw {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $template = shift;
 	my $vars = shift;
 	return _execute($session, {
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index 920862d53..221ef6f06 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -60,7 +60,7 @@ An array of hashes to prepend to the list
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Wobject');
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 1fbc0668e..3830df8c0 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -67,7 +67,7 @@ text will come out formatted as paragraphs.
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_Article');
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index e1a6c29b7..bb5176662 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -32,7 +32,7 @@ sub appendPostListTemplateVars {
 	my $page = $p->getPageData;
 	my $i = 0;
 	foreach my $row (@$page) {
-		my $post = WebGUI::Asset->new($row->{assetId}, $row->{className}, $row->{revisionDate});
+		my $post = WebGUI::Asset->new($self->session,$row->{assetId}, $row->{className}, $row->{revisionDate});
 		$post->{_parent} = $self; # caching parent for efficiency 
 		my $controls = $self->session->icon->delete('func=delete',$post->get("url"),"Delete").$self->session->icon->edit('func=edit',$post->get("url"));
 		if ($self->get("sortBy") eq "lineage") {
@@ -253,7 +253,7 @@ sub decrementThreads {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Collaboration");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 6714bf118..aac371e64 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -38,7 +38,7 @@ sub canPersonalize {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
   my $definition = shift;
 	my %properties;
 	tie %properties, 'Tie::IxHash';
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index a6371030f..156887847 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -130,7 +130,7 @@ sub defaultViewForm {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_DataForm");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index eaffe2846..22ca16910 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -35,7 +35,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_EventsCalendar");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index b01b3173d..58d477835 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -55,7 +55,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Folder");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index def17006c..b883562c8 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -28,7 +28,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_HttpProxy");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
index 0b41415f4..f1e15d98d 100644
--- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
@@ -59,7 +59,7 @@ sub _fetchDepartments {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_InOutBoard");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index 884629eb6..8bbd2436f 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -19,7 +19,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_IndexedSearch");
 	push (@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index f35c5f637..eac9c50ea 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -55,7 +55,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Layout");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index bfd1bc41f..dfd4d68ac 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -17,7 +17,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Matrix");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index 37f58e59d..de2a04cd9 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -22,7 +22,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_MessageBoard");
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
index 5427b8dbf..b757f17d8 100644
--- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
@@ -39,7 +39,7 @@ defines wobject properties for MultiSearch instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session, "Asset_MultiSearch");
 	my $properties = {
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index b6f73ca13..2638ebd9c 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -25,7 +25,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Navigation");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 7e96c64c0..6c0c7e890 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -33,7 +33,7 @@ sub _hasVoted {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Poll");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index a4cee4fc6..90ac5f9e1 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -92,7 +92,7 @@ sub addRevision {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Product");
 	push(@{$definition}, {
@@ -813,7 +813,7 @@ sub view {
       $segment = $self->session->icon->delete('func=deleteAccessoryConfirm&aid='.$id,$self->get("url"),$i18n->get(2))
                  .$self->session->icon->moveUp('func=moveAccessoryUp&aid='.$id,$self->get("url"))
                  .$self->session->icon->moveDown('func=moveAccessoryDown&aid='.$id,$self->get("url"));
-		my $accessory = WebGUI::Asset->newByDynamicClass($id);
+		my $accessory = WebGUI::Asset->newByDynamicClass($self->session,$id);
 	  push(@accessoryloop,{
 			               "accessory.URL"=>$accessory->getUrl,
 			               "accessory.title"=>$accessory->getTitle,
@@ -834,7 +834,7 @@ sub view {
       $segment = $self->session->icon->delete('func=deleteRelatedConfirm&rid='.$id,$self->get("url"),$i18n->get(4))
                  .$self->session->icon->moveUp('func=moveRelatedUp&rid='.$id,$self->get("url"))
                  .$self->session->icon->moveDown('func=moveRelatedDown&rid='.$id,$self->get("url"));
-		my $related = WebGUI::Asset->newByDynamicClass($id);
+		my $related = WebGUI::Asset->newByDynamicClass($self->session,$id);
       push(@relatedloop,{
 			              "relatedproduct.URL"=>$related->getUrl,
 			              "relatedproduct.title"=>$related->getTitle,
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index 910ecccce..8edecdbef 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -26,7 +26,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_SQLReport");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm
index 3f6fb3e39..ead39666e 100644
--- a/lib/WebGUI/Asset/Wobject/StockData.pm
+++ b/lib/WebGUI/Asset/Wobject/StockData.pm
@@ -269,7 +269,7 @@ defines wobject properties for Stock Data instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $properties = {
 		templateId =>{
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 6593eca45..8c8b04f29 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -55,7 +55,7 @@ sub completeResponse {
 #-------------------------------------------------------------------
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_Survey');
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index b8dcc59c9..aa96d269f 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -63,7 +63,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift;
 	my %properties;
 	tie %properties, 'Tie::IxHash';
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index 082de9d80..ccdafd7e4 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -31,7 +31,7 @@ sub _create_cache_key {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 my $httpHeaderFieldType;
    if ($session->config->get('soapHttpHeaderOverride')) {
diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm
index 018c77aa6..f912d7473 100644
--- a/lib/WebGUI/Asset/Wobject/WeatherData.pm
+++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm
@@ -41,7 +41,7 @@ defines wobject properties for WeatherData instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session, "Asset_WeatherData");
 	my $properties = {
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index c72813178..ca3289dd1 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -98,7 +98,7 @@ sub www_editBranch {
 	my $ac = WebGUI::AdminConsole->new($self->session,"assets");
 	my $i18n = WebGUI::International->new($self->session,"Asset");
 	return $self->session->privilege->insufficient() unless ($self->canEdit);
-	my $tabform = WebGUI::TabForm->new;
+	my $tabform = WebGUI::TabForm->new($self->session);
 	$tabform->hidden({name=>"func",value=>"editBranchSave"});
 	$tabform->addTab("properties",$i18n->get("properties"),9);
         $tabform->getTab("properties")->readOnly(
@@ -214,7 +214,7 @@ sub www_editBranch {
         }
         my $clause;
         if ($self->session->user->isInGroup(3)) {
-                my $contentManagers = WebGUI::Group->new(4)->getUsers(1);
+                my $contentManagers = WebGUI::Group->new($self->session,4)->getUsers(1);
                 push (@$contentManagers, $self->session->user->userId);
                 $clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
         } else {
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 65e23a690..78933bf7c 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -59,7 +59,7 @@ sub addChild {
 	$self->session->db->beginTransaction;
 	my $now =$self->session->datetime->time();
 	$self->session->db->write("insert into asset (assetId, parentId, lineage, creationDate, createdBy, className, state) values (".$self->session->db->quote($id).",".$self->session->db->quote($self->getId).", ".$self->session->db->quote($lineage).", ".$now.", ".$self->session->db->quote($self->session->user->userId).", ".$self->session->db->quote($properties->{className}).", 'published')");
-	my $temp = WebGUI::Asset->newByPropertyHashRef({
+	my $temp = WebGUI::Asset->newByPropertyHashRef($self->session,{
 		assetId=>$id,
 		className=>$properties->{className}
 		});
@@ -93,7 +93,7 @@ sub cascadeLineage {
 	my $now =$self->session->datetime->time();
         my $prepared = $self->session->db->prepare("update asset set lineage=? where assetId=?");
 	my $descendants = $self->session->db->read("select assetId,lineage from asset where lineage like ".$self->session->db->quote($oldLineage.'%'));
-	my $cache = WebGUI::Cache->new;
+	my $cache = WebGUI::Cache->new($self->session);
 	while (my ($assetId, $lineage) = $descendants->array) {
 		my $fixedLineage = $newLineage.substr($lineage,length($oldLineage));
 		$prepared->execute([$fixedLineage,$assetId]);
@@ -162,7 +162,7 @@ sub getFirstChild {
 				$self->session->stow->set("assetLineage", $assetLineage);
 			}
 		}
-		$self->{_firstChild} = WebGUI::Asset->newByLineage($lineage);
+		$self->{_firstChild} = WebGUI::Asset->newByLineage($self->session,$lineage);
 	}
 	return $self->{_firstChild};
 }
@@ -186,7 +186,7 @@ sub getLastChild {
 			$assetLineage->{lastChild}{$self->getId} = $lineage;
 			$self->session->stow->set("assetLineage", $assetLineage);
 		}
-		$self->{_lastChild} = WebGUI::Asset->newByLineage($lineage);
+		$self->{_lastChild} = WebGUI::Asset->newByLineage($self->session,$lineage);
 	}
 	return $self->{_lastChild};
 }
@@ -429,7 +429,7 @@ Returns an asset hash of the parent of current Asset.
 sub getParent {
 	my $self = shift;
 	return $self if ($self->getId eq "PBasset000000000000001");
-	$self->{_parent} = WebGUI::Asset->newByDynamicClass($self->get("parentId")) unless (exists $self->{_parent});
+	$self->{_parent} = WebGUI::Asset->newByDynamicClass($self->session,$self->get("parentId")) unless (exists $self->{_parent});
 	return $self->{_parent};
 }
 
@@ -515,7 +515,7 @@ Lineage string.
 
 sub newByLineage {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $lineage = shift;
 	my $assetLineage = $session->stow->get("assetLineage");
 	my $id = $assetLineage->{$lineage}{id};
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 2ce6edff2..1c04db75f 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -79,7 +79,7 @@ sub getAssetsInTrash {
                         assetData.title desc
                         ");
         while (my ($id, $date, $class) = $sth->array) {
-                push(@assets, WebGUI::Asset->new($id,$class,$date));
+                push(@assets, WebGUI::Asset->new($self->session,$id,$class,$date));
         }
 	$sth->finish;
 	return \@assets;
@@ -105,7 +105,7 @@ sub purge {
 	$self->session->db->write("delete from asset where assetId=".$self->session->db->quote($self->getId));
 	$self->session->db->commit;
 	$self->purgeCache;
-	WebGUI::Cache->new->deleteChunk(["asset",$self->getId]);
+	WebGUI::Cache->new($self->session)->deleteChunk(["asset",$self->getId]);
 	$self->updateHistory("purged");
 	$self = undef;
 }
@@ -161,7 +161,7 @@ sub www_deleteList {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless $self->canEdit;
 	foreach my $assetId ($self->session->request->param("assetId")) {
-		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
+		my $asset = WebGUI::Asset->newByDynamicClass($self->session,$assetId);
 		if ($asset->canEdit) {
 			$asset->trash;
 		}
@@ -246,7 +246,7 @@ sub www_restoreList {
         my $self = shift;
         return $self->session->privilege->insufficient() unless $self->canEdit;
         foreach my $id ($self->session->request->param("assetId")) {
-                my $asset = WebGUI::Asset->newByDynamicClass($id);
+                my $asset = WebGUI::Asset->newByDynamicClass($self->session,$id);
                 $asset->publish;
         }
         if ($self->session->form->process("proceed") ne "") {
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index 94e3fb968..40fa4ba25 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -66,7 +66,7 @@ sub addRevision {
                         $self->session->db->write("insert into ".$definition->{tableName}." (assetId,revisionDate) values (".$self->session->db->quote($self->getId).",".$now.")");
                 }
         }               
-        my $newVersion = WebGUI::Asset->new($self->getId, $self->get("className"), $now);
+        my $newVersion = WebGUI::Asset->new($self->session,$self->getId, $self->get("className"), $now);
         $newVersion->updateHistory("created revision");
 	$newVersion->update($self->get);
 	$newVersion->setVersionLock unless ($self->session->setting->get("autoCommit"));
@@ -147,7 +147,7 @@ sub commitVersionTag {
 	my $tagId = shift;
 	my $sth = $self->session->db->read("select asset.assetId,asset.className,assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId=".$self->session->db->quote($tagId));
 	while (my ($id,$class,$version) = $sth->array) {
-		WebGUI::Asset->new($id,$class,$version)->commit;
+		WebGUI::Asset->new($self->session,$id,$class,$version)->commit;
 	}
 	$sth->finish;
 	$self->session->db->write("update assetVersionTag set isCommitted=1, commitDate=".$self->session->datetime->time().", committedBy=".$self->session->db->quote($self->session->user->userId)." where tagId=".$self->session->db->quote($tagId));
@@ -235,7 +235,7 @@ sub rollbackToTime {
 	}
 	my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.revisionDate > ".$toTime." order by assetData.revisionDate desc");
 	while (my ($class, $id, $revisionDate) = $sth->array) {
-		my $revision = WebGUI::Asset->new($id, $class, $revisionDate);
+		my $revision = WebGUI::Asset->new($self->session,$id, $class, $revisionDate);
 		$revision->purgeRevision;
 	}
 	$sth->finish;
@@ -267,7 +267,7 @@ sub rollbackVersionTag {
 	}
 	my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId = ".$self->session->db->quote($tagId)." order by assetData.revisionDate desc");
 	while (my ($class, $id, $revisionDate) = $sth->array) {
-		my $revision = WebGUI::Asset->new($id, $class, $revisionDate);
+		my $revision = WebGUI::Asset->new($self->session,$id, $class, $revisionDate);
 		$revision->purgeRevision;
 	}
 	$sth->finish;
@@ -414,7 +414,7 @@ sub www_manageCommittedVersions {
         my $self = shift;
         my $ac = WebGUI::AdminConsole->new($self->session,"versions");
         return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(3));
-        my $i18n = WebGUI::International->new("Asset");
+        my $i18n = WebGUI::International->new($self->session,"Asset");
 	my $rollback = $i18n->get('rollback');
 	my $rollbackPrompt = $i18n->get('rollback version tag confirm');
         $ac->addSubmenuItem($self->getUrl('func=addVersionTag'), $i18n->get("add a version tag"));
@@ -423,7 +423,7 @@ sub www_manageCommittedVersions {
         <tr><th>Tag Name</th><th>Committed On</th><th>Committed By</th><th></th></tr> ';
         my $sth = $self->session->db->read("select tagId,name,commitDate,committedBy from assetVersionTag where isCommitted=1");
         while (my ($id,$name,$date,$by) = $sth->array) {
-                my $u = WebGUI::User->new($by);
+                my $u = WebGUI::User->new($self->session,$by);
                 $output .= '<tr>
 			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
 			<td>'.$self->session->datetime->epochToHuman($date).'</td>
@@ -446,9 +446,9 @@ Shows a list of the revisions for this asset.
 
 sub www_manageRevisions {
         my $self = shift;
-        my $ac = WebGUI::AdminConsole->new("versions");
+        my $ac = WebGUI::AdminConsole->new($self->session,"versions");
         return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(3));
-        my $i18n = WebGUI::International->new("Asset");
+        my $i18n = WebGUI::International->new($self->session,"Asset");
         my $output = '<table width=100% class="content">
         <tr><th></th><th>Revision Date</th><th>Revised By</th><th>Tag Name</th></tr> ';
         my $sth = $self->session->db->read("select assetData.revisionDate, users.username, assetVersionTag.name,assetData.tagId from assetData 
@@ -477,9 +477,9 @@ Shows a list of the currently available asset version tags.
 
 sub www_manageVersions {
 	my $self = shift;
-        my $ac = WebGUI::AdminConsole->new("versions");
+        my $ac = WebGUI::AdminConsole->new($self->session,"versions");
         return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(3));
-	my $i18n = WebGUI::International->new("Asset");
+	my $i18n = WebGUI::International->new($self->session,"Asset");
 	$ac->setHelp("versions manage");
 	$ac->addSubmenuItem($self->getUrl('func=addVersionTag'), $i18n->get("add a version tag"));
 	$ac->addSubmenuItem($self->getUrl('func=manageCommittedVersions'), $i18n->get("manage committed versions"));
@@ -494,7 +494,7 @@ sub www_manageVersions {
 	<tr><th></th><th>Tag Name</th><th>Created On</th><th>Created By</th><th></th></tr> ';
 	my $sth = $self->session->db->read("select tagId,name,creationDate,createdBy from assetVersionTag where isCommitted=0");
 	while (my ($id,$name,$date,$by) = $sth->array) {
-		my $u = WebGUI::User->new($by);
+		my $u = WebGUI::User->new($self->session,$by);
 		$output .= '<tr>
 			<td>'.$self->session->icon->delete("func=rollbackVersionTag;tagId=".$id,$self->get("url"),$rollbackPrompt).'</td>
 			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
@@ -514,9 +514,9 @@ sub www_manageVersions {
 
 sub www_manageRevisionsInTag {
 	my $self = shift;
-	my $ac = WebGUI::AdminConsole->new("versions");
+	my $ac = WebGUI::AdminConsole->new($self->session,"versions");
         return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(3));
-        my $i18n = WebGUI::International->new("Asset");
+        my $i18n = WebGUI::International->new($self->session,"Asset");
 	$ac->addSubmenuItem($self->getUrl('func=addVersionTag'), $i18n->get("add a version tag"));
 	$ac->addSubmenuItem($self->getUrl('func=manageCommittedVersions'), $i18n->get("manage committed versions"));
         $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
@@ -528,7 +528,7 @@ sub www_manageRevisionsInTag {
 		where assetData.tagId=".$self->session->db->quote($self->session->form->process("tagId")));
 	foreach my $row (@{$p->getPageData}) {
         	my ($date,$by,$id, $class) = ($row->{revisionDate}, $row->{username}, $row->{assetId}, $row->{className});
-		my $asset = WebGUI::Asset->new($id,$class,$date);
+		my $asset = WebGUI::Asset->new($self->session,$id,$class,$date);
                 $output .= '<tr><td>'.$self->session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$self->session->form->process("tagId").";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt")).'</td>
 			<td>'.$asset->getTitle.'</td>
 			<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
@@ -548,7 +548,7 @@ sub www_purgeRevision {
 	return $self->session->privilege->insufficient() unless $self->canEdit;
 	my $revisionDate = $self->session->form->process("revisionDate");
 	return undef unless $revisionDate;
-	WebGUI::Asset->new($self->getId,$self->get("className"),$revisionDate)->purgeRevision;
+	WebGUI::Asset->new($self->session,$self->getId,$self->get("className"),$revisionDate)->purgeRevision;
 	if ($self->session->form->process("proceed") eq "manageRevisionsInTag") {
 		return $self->www_manageRevisionsInTag;
 	}
@@ -601,7 +601,7 @@ sub www_setVersionTag () {
 
 sub www_viewRevision {
 	my $self = shift;
-	my $otherSelf = WebGUI::Asset->new($self->getId,$self->get("className"),$self->session->form->process("revisionDate"));
+	my $otherSelf = WebGUI::Asset->new($self->session,$self->getId,$self->get("className"),$self->session->form->process("revisionDate"));
 	return (defined $otherSelf) ? $otherSelf->www_view : undef;
 }
 
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 8a7a310ef..36b91c277 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -411,7 +411,7 @@ sub login {
 #-------------------------------------------------------------------
 sub new {
    my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my $authMethod = $_[0];
    my $userId = $_[1];
    my @callable = ('createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','createAccountSave','deactivateAccountConfirm');
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index 90a24c8d7..733a2f65a 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -504,7 +504,7 @@ sub login {
 #-------------------------------------------------------------------
 sub new {
    my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my $authMethod = $_[0];
    my $userId = $_[1];
    my @callable = ('validateEmail','createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','recoverPassword','resetExpiredPassword','recoverPasswordFinish','createAccountSave','deactivateAccountConfirm','resetExpiredPasswordSave','updateAccount');
@@ -631,7 +631,7 @@ sub validateEmail {
 	my $self = shift;
 	my ($userId) = $self->session->db->quickArray("select userId from authentication where fieldData=".$self->session->db->quote($self->session->form->process("key"))." and fieldName='emailValidationKey' and authMethod='WebGUI'");
 	if (defined $userId) {
-		my $u = WebGUI::User->new($userId);
+		my $u = WebGUI::User->new($self->session,$userId);
 		$u->status("Active");
 	}
 	return $self->displayLogin;
diff --git a/lib/WebGUI/Cache.pm b/lib/WebGUI/Cache.pm
index de71770c9..a56047dcc 100644
--- a/lib/WebGUI/Cache.pm
+++ b/lib/WebGUI/Cache.pm
@@ -116,7 +116,7 @@ A subdivider to store this cache under. When building your own cache plug-in def
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->config->get("memcached_servers")) {
 		require WebGUI::Cache::Memcached;
 		return WebGUI::Cache::Memcached->new($session,@_);
diff --git a/lib/WebGUI/Cache/FileCache.pm b/lib/WebGUI/Cache/FileCache.pm
index b3bfa2571..6138bb28b 100644
--- a/lib/WebGUI/Cache/FileCache.pm
+++ b/lib/WebGUI/Cache/FileCache.pm
@@ -210,7 +210,7 @@ Defaults to the config filename for the current site. The only reason to overrid
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = $class->parseKey(shift);
 	my $namespace = shift || $session->config->getFilename;
 	bless {_session=>$session, _key=>$key, _namespace=>$namespace}, $class;
diff --git a/lib/WebGUI/Cache/Memcached.pm b/lib/WebGUI/Cache/Memcached.pm
index 71fc681e4..e9633718e 100644
--- a/lib/WebGUI/Cache/Memcached.pm
+++ b/lib/WebGUI/Cache/Memcached.pm
@@ -115,7 +115,7 @@ Defaults to the config filename for the current site. The only reason to overrid
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = $class->parseKey(shift);
 	my $namespace = shift || $session->config->getFilename;
 
diff --git a/lib/WebGUI/Commerce.pm b/lib/WebGUI/Commerce.pm
index 963cbbc76..7e0806219 100644
--- a/lib/WebGUI/Commerce.pm
+++ b/lib/WebGUI/Commerce.pm
@@ -4,7 +4,7 @@ use strict;
 
 #-------------------------------------------------------------------
 sub setCommerceSetting {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($entry);
 	$entry = shift;
 	$session->db->write("delete from commerceSettings where ". 
diff --git a/lib/WebGUI/Commerce/Item.pm b/lib/WebGUI/Commerce/Item.pm
index 17b2c0f70..d98c052fd 100644
--- a/lib/WebGUI/Commerce/Item.pm
+++ b/lib/WebGUI/Commerce/Item.pm
@@ -9,15 +9,15 @@ Package WebGUI::Commerce::Item
 This is the SUPER class off all Item plugins. Item plugins are an abstraction layer to connect
 arbitrary types of products and other stuff you might want to sell to the commerce system.
 
-The SUPER class new method provides an easy way to load Item plugins: WebGUI::Item->new('1234', 'MyItem') 
-is equivalent to WebGUI::Item::MyItem->new('1234'). The SUPER class new has the benefit of added
+The SUPER class new method provides an easy way to load Item plugins: WebGUI::Item->new($self->session,'1234', 'MyItem') 
+is equivalent to WebGUI::Item::MyItem->new($self->session,'1234'). The SUPER class new has the benefit of added
 error checking, so you should use this.
 
 
 =head1 SYNOPSIS
 
  use WebGUI::Item;
- $item = WebGUI::Item->new($itemId, $itemType);
+ $item = WebGUI::Item->new($self->session,$itemId, $itemType);
 
  $description = $item->description;
  $duration = $item->duration;
diff --git a/lib/WebGUI/Commerce/Payment.pm b/lib/WebGUI/Commerce/Payment.pm
index a6ea2c9aa..3322dfb73 100644
--- a/lib/WebGUI/Commerce/Payment.pm
+++ b/lib/WebGUI/Commerce/Payment.pm
@@ -280,7 +280,7 @@ The namespace of the plugin.
 sub load {
 	my ($class, $namespace, $load, $cmd, $plugin);
     	$class = shift;
-    	my $session = shift;
+    	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$namespace = shift;
 	
     	$cmd = "WebGUI::Commerce::Payment::$namespace";
diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm
index 4ae25e636..e1d4371cd 100644
--- a/lib/WebGUI/Commerce/Payment/ITransact.pm
+++ b/lib/WebGUI/Commerce/Payment/ITransact.pm
@@ -38,7 +38,7 @@ sub cancelRecurringPayment {
 		$self->{_recurring} = 1;
 
 		my $itemProperties = $recurring->{transaction}->getItems->[0];
-		my $item = WebGUI::Commerce::Item->new($itemProperties->{itemId}, $itemProperties->{itemType});
+		my $item = WebGUI::Commerce::Item->new($self->session,$itemProperties->{itemId}, $itemProperties->{itemType});
 		my $recipe = _resolveRecipe($item->duration);
 		    
 		# Set up a user agent that uses cookies and allows POST redirects
@@ -479,7 +479,7 @@ sub confirmRecurringTransaction {
 	
 	my $transaction = WebGUI::Commerce::Transaction->getByGatewayId($self->session->form->process("orig_xid"), $self->namespace);
 	my $itemProperties = $transaction->getItems->[0];
-	my $item = WebGUI::Commerce::Item->new($itemProperties->{itemId}, $itemProperties->{itemType});
+	my $item = WebGUI::Commerce::Item->new($self->session,$itemProperties->{itemId}, $itemProperties->{itemType});
 	
 	my $startEpoch = $self->session->datetime->setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $self->session->form->process("start_date"))));
 	my $currentEpoch = $self->session->datetime->setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $self->session->form->process("when"))));
@@ -802,7 +802,7 @@ sub validateFormData {
 	my ($self, @error, $i18n, $currentYear, $currentMonth);
 	$self = shift;
 
-	$i18n = WebGUI::International->new('CommercePaymentITransact');
+	$i18n = WebGUI::International->new($self->session,'CommercePaymentITransact');
 
 	push (@error, $i18n->get('invalid firstName')) unless ($self->session->form->process("firstName"));
 	push (@error, $i18n->get('invalid lastName')) unless ($self->session->form->process("lastName"));
diff --git a/lib/WebGUI/Commerce/Shipping.pm b/lib/WebGUI/Commerce/Shipping.pm
index 2546c3203..d4ecf3e8b 100644
--- a/lib/WebGUI/Commerce/Shipping.pm
+++ b/lib/WebGUI/Commerce/Shipping.pm
@@ -206,7 +206,7 @@ The namespace of the plugin.
 sub load {
 	my ($class, $namespace, $load, $cmd, $plugin);
     	$class = shift;
-    	my $session = shift;
+    	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$namespace = shift;
 
 	$session->errorHandler->fatal('No namespace passed to load.') unless ($namespace);
diff --git a/lib/WebGUI/Commerce/ShoppingCart.pm b/lib/WebGUI/Commerce/ShoppingCart.pm
index 86b89945b..10248882a 100644
--- a/lib/WebGUI/Commerce/ShoppingCart.pm
+++ b/lib/WebGUI/Commerce/ShoppingCart.pm
@@ -64,7 +64,7 @@ sub add {
 	$itemType = shift;
 	$quantity = shift || 1;
 
-	$item = WebGUI::Commerce::Item->new($itemId, $itemType);
+	$item = WebGUI::Commerce::Item->new($self->session,$itemId, $itemType);
 	return "" unless ($item->available);
 	
 	$self->{_items}{$itemId."_".$itemType} = {
@@ -209,7 +209,7 @@ sub getItems {
 	$periodResolve = WebGUI::Commerce::Payment::recurringPeriodValues($self->session);
 	%cartContent = %{$self->{_items}};
 	foreach (values(%cartContent)) {
-		$item = WebGUI::Commerce::Item->new($_->{itemId}, $_->{itemType});
+		$item = WebGUI::Commerce::Item->new($self->session,$_->{itemId}, $_->{itemType});
 		$properties = {
 			quantity        => $_->{quantity},
 			period          => lc($periodResolve->{$item->duration}),
diff --git a/lib/WebGUI/Commerce/Transaction.pm b/lib/WebGUI/Commerce/Transaction.pm
index e18832137..213075d30 100644
--- a/lib/WebGUI/Commerce/Transaction.pm
+++ b/lib/WebGUI/Commerce/Transaction.pm
@@ -87,7 +87,7 @@ sub completeTransaction {
 	$self = shift;
 
 	foreach (@{$self->getItems}) {
-		$item = WebGUI::Commerce::Item->new($_->{itemId}, $_->{itemType});
+		$item = WebGUI::Commerce::Item->new($self->session,$_->{itemId}, $_->{itemType});
 		$item->handler;
 	}
 
@@ -414,7 +414,7 @@ sub new {
 	my ($class, $transactionId, $gatewayId, $userId, $properties, $sth, $row, @items);
 	
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$transactionId = shift;
 	$gatewayId = shift;
 	$userId = shift || $session->user->userId;
diff --git a/lib/WebGUI/DatabaseLink.pm b/lib/WebGUI/DatabaseLink.pm
index ec7c3cbae..9dd73a330 100644
--- a/lib/WebGUI/DatabaseLink.pm
+++ b/lib/WebGUI/DatabaseLink.pm
@@ -77,7 +77,7 @@ A hash reference containing the list of params to set. See the set() method for
 
 sub create {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $params = shift;
 	$params->{databaseLinkId} = "new";
 	my $id = $session->db->setRow("databaseLink","databaseLinkId",$params);
@@ -193,7 +193,7 @@ A reference to the current session.
 
 sub getList {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $list = $session->db->buildHashRef("select databaseLinkId, title from databaseLink order by title");
 	my $i18n = WebGUI::International->new($session);
 	$list->{'0'} = $i18n->get(1076);
@@ -221,7 +221,7 @@ sub new {
     my ($class, $databaseLinkId, %databaseLink);
     tie %databaseLink, 'Tie::CPHash';
     $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$databaseLinkId = shift;
 	unless ($databaseLinkId eq "") {
 		if ($databaseLinkId eq "0") {
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index b027e25b3..e386094a9 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -60,7 +60,7 @@ Dynamically creates functions on the fly for all the different form control type
 sub AUTOLOAD {
 	our $AUTOLOAD;
 	my $name = ucfirst((split /::/, $AUTOLOAD)[-1]);	
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @params = @_;
 	my $cmd = "use WebGUI::Form::".$name;
         eval ($cmd);
@@ -123,7 +123,7 @@ If you want to add anything special to the form header like javascript actions o
 =cut
 
 sub formHeader {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $params = shift;
         my $action = $params->{action} || $session->url->page();
 	my $hidden;
diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm
index 982e8049d..0f42c6bed 100644
--- a/lib/WebGUI/Form/Asset.pm
+++ b/lib/WebGUI/Form/Asset.pm
@@ -65,7 +65,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, "Asset");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Button.pm b/lib/WebGUI/Form/Button.pm
index 36901963a..7ee44b6e7 100644
--- a/lib/WebGUI/Form/Button.pm
+++ b/lib/WebGUI/Form/Button.pm
@@ -54,7 +54,7 @@ The default text to appear on the button. Defaults to an internationalized versi
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session,"WebGUI");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index 322b95fca..5625e9245 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Checkbox.pm b/lib/WebGUI/Form/Checkbox.pm
index 867bd3306..ed7546dae 100644
--- a/lib/WebGUI/Form/Checkbox.pm
+++ b/lib/WebGUI/Form/Checkbox.pm
@@ -61,7 +61,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm
index 3d55a7c5e..615ffe15e 100644
--- a/lib/WebGUI/Form/Codearea.pm
+++ b/lib/WebGUI/Form/Codearea.pm
@@ -55,7 +55,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm
index e6c0d5abb..4fe277837 100644
--- a/lib/WebGUI/Form/Color.pm
+++ b/lib/WebGUI/Form/Color.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Combo.pm b/lib/WebGUI/Form/Combo.pm
index 549b26642..57d2b554d 100644
--- a/lib/WebGUI/Form/Combo.pm
+++ b/lib/WebGUI/Form/Combo.pm
@@ -56,7 +56,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/ContentType.pm b/lib/WebGUI/Form/ContentType.pm
index 793ee0809..acfa6dc55 100644
--- a/lib/WebGUI/Form/ContentType.pm
+++ b/lib/WebGUI/Form/ContentType.pm
@@ -62,7 +62,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index 7a891b3cf..6415a1fe3 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -35,7 +35,7 @@ Base class for all form field objects. Never use this class directly.
 Subclasses will look like this:
 
  use WebGUI::Form::subclass;
- my $obj = WebGUI::Form::subclass->new(%params);
+ my $obj = WebGUI::Form::subclass->new($session,%params);
 
  my $html = $obj->toHtml;
  my $html = $obj->toHtmlAsHidden;
@@ -149,7 +149,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	push(@{$definition}, {
 		formName=>{
@@ -304,7 +304,7 @@ Returns a human readable name for this form control type. You MUST override this
 
 sub getName {
 	my $self = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = $self->definition($session);
 	return $definition->[0]->{formName}->{defaultValue};
 }
@@ -397,6 +397,7 @@ Retrieves a value from a form GET or POST and returns it. If the value comes bac
 
 sub getValueFromPost {
 	my $self = shift;
+	$self->session->errorHandler->warn("trying to get ".$self->get("name"));
 	my $formValue = $self->session->request->param($self->get("name"));
 	if (defined $formValue) {
 		return $formValue;
@@ -430,7 +431,7 @@ Please note that an id attribute is automatically added to every form element wi
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %raw;
 	# deal with a hash reference full of properties
 	if (ref $_[0] eq "HASH") {
diff --git a/lib/WebGUI/Form/DatabaseLink.pm b/lib/WebGUI/Form/DatabaseLink.pm
index 9732f5793..c7c011bd4 100644
--- a/lib/WebGUI/Form/DatabaseLink.pm
+++ b/lib/WebGUI/Form/DatabaseLink.pm
@@ -71,7 +71,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index d884b3b3e..198205ed1 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -72,7 +72,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
@@ -170,7 +170,7 @@ Renders the form field to HTML as a hidden field rather than whatever field type
 
 sub toHtmlAsHidden {
         my $self = shift;
-        return WebGUI::Form::Hidden->new(
+        return WebGUI::Form::Hidden->new($self->session,
                 name=>$self->get("name"),
                 value=>$self->session->datetime->epochToSet($self->get("value"))
                 )->toHtmlAsHidden;
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index f31341ac3..a0fe1ddf1 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -67,7 +67,7 @@ If no value is specified, this will be used. Defaults to today and now.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/DynamicField.pm b/lib/WebGUI/Form/DynamicField.pm
index bbbc7b22e..dbcb5dd4e 100644
--- a/lib/WebGUI/Form/DynamicField.pm
+++ b/lib/WebGUI/Form/DynamicField.pm
@@ -55,7 +55,7 @@ Defaults to "Text". Should be any valid field type.
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
@@ -97,7 +97,7 @@ array will be used.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %raw = @_;
 	my $param = \%raw;
         my $fieldType = ucfirst($param->{fieldType});
diff --git a/lib/WebGUI/Form/Email.pm b/lib/WebGUI/Form/Email.pm
index ff843f577..f6116d04e 100644
--- a/lib/WebGUI/Form/Email.pm
+++ b/lib/WebGUI/Form/Email.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/FieldType.pm b/lib/WebGUI/Form/FieldType.pm
index 28a933302..6ee1eea0a 100644
--- a/lib/WebGUI/Form/FieldType.pm
+++ b/lib/WebGUI/Form/FieldType.pm
@@ -60,7 +60,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
@@ -90,7 +90,7 @@ and DynamicField, the form class dispatcher.
 
 sub getTypes {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	opendir(DIR,$session->config->getWebguiRoot."/lib/WebGUI/Form/");
 	my @rawTypes = readdir(DIR);
 	closedir(DIR);
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index a5725d60b..7068158a8 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -63,7 +63,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
@@ -106,7 +106,7 @@ sub displayForm {
 		my $action = join '_', '_', $self->get("name"), 'delete';
 		$fileForm .= $i18n->get(392)
 			  .  "&nbsp"x4
-			  . WebGUI::Form::YesNo->new({-name=>$action, -value=>0})->toHtml;
+			  . WebGUI::Form::YesNo->new($self->session,{-name=>$action, -value=>0})->toHtml;
 	}
 	my $hid = $self->toHtmlAsHidden();
 	$fileForm .= $hid;
diff --git a/lib/WebGUI/Form/FilterContent.pm b/lib/WebGUI/Form/FilterContent.pm
index c34c0a4c3..2dfd9cd6d 100644
--- a/lib/WebGUI/Form/FilterContent.pm
+++ b/lib/WebGUI/Form/FilterContent.pm
@@ -63,7 +63,7 @@ A tooltip for what to do with this field. Defaults to a general explaination of
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 10335f30a..c17e32e15 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Group.pm b/lib/WebGUI/Form/Group.pm
index 14f65ab47..9a46196b7 100644
--- a/lib/WebGUI/Form/Group.pm
+++ b/lib/WebGUI/Form/Group.pm
@@ -71,7 +71,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index 717e5e407..1d5f489a1 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -69,7 +69,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
@@ -118,9 +118,9 @@ sub toHtml {
 	my $self = shift;
         $self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' });
 	$self->get("extras") .= ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" ';	
-	return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->get("richEditId"))->getRichEditor($self->get('id'));
+	return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"))->getRichEditor($self->get('id'));
 	my $i18n = WebGUI::International->new($self->session);
-	my $richEdit = WebGUI::Asset::RichEdit->new($self->get("richEditId"));
+	my $richEdit = WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"));
         if (defined $richEdit) {
                 return $self->SUPER::toHtml.$richEdit->getRichEditor($self->get('id'));
         } else {
diff --git a/lib/WebGUI/Form/Hidden.pm b/lib/WebGUI/Form/Hidden.pm
index 12e729b79..2d8513a6f 100644
--- a/lib/WebGUI/Form/Hidden.pm
+++ b/lib/WebGUI/Form/Hidden.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/HiddenList.pm b/lib/WebGUI/Form/HiddenList.pm
index 847f977b9..f2c469b87 100644
--- a/lib/WebGUI/Form/HiddenList.pm
+++ b/lib/WebGUI/Form/HiddenList.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index db38f25ee..fb5b0b1af 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -64,7 +64,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Integer.pm b/lib/WebGUI/Form/Integer.pm
index dff0f9359..4ffc55883 100644
--- a/lib/WebGUI/Form/Integer.pm
+++ b/lib/WebGUI/Form/Integer.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Interval.pm b/lib/WebGUI/Form/Interval.pm
index 7a9537510..d8604967b 100644
--- a/lib/WebGUI/Form/Interval.pm
+++ b/lib/WebGUI/Form/Interval.pm
@@ -63,7 +63,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/LdapLink.pm b/lib/WebGUI/Form/LdapLink.pm
index efbbf3956..4082c3e23 100644
--- a/lib/WebGUI/Form/LdapLink.pm
+++ b/lib/WebGUI/Form/LdapLink.pm
@@ -75,7 +75,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/List.pm b/lib/WebGUI/Form/List.pm
index 60af27e51..c24667800 100644
--- a/lib/WebGUI/Form/List.pm
+++ b/lib/WebGUI/Form/List.pm
@@ -145,7 +145,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Password.pm b/lib/WebGUI/Form/Password.pm
index febee44f3..c24b7671c 100644
--- a/lib/WebGUI/Form/Password.pm
+++ b/lib/WebGUI/Form/Password.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Phone.pm b/lib/WebGUI/Form/Phone.pm
index 88610a516..272743ca5 100644
--- a/lib/WebGUI/Form/Phone.pm
+++ b/lib/WebGUI/Form/Phone.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Radio.pm b/lib/WebGUI/Form/Radio.pm
index bdcf2cd7f..17340f788 100644
--- a/lib/WebGUI/Form/Radio.pm
+++ b/lib/WebGUI/Form/Radio.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/RadioList.pm b/lib/WebGUI/Form/RadioList.pm
index 311db7556..aaf6ecc98 100644
--- a/lib/WebGUI/Form/RadioList.pm
+++ b/lib/WebGUI/Form/RadioList.pm
@@ -70,7 +70,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/ReadOnly.pm b/lib/WebGUI/Form/ReadOnly.pm
index 585b2fd16..35dcd59e9 100644
--- a/lib/WebGUI/Form/ReadOnly.pm
+++ b/lib/WebGUI/Form/ReadOnly.pm
@@ -55,7 +55,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/SelectBox.pm b/lib/WebGUI/Form/SelectBox.pm
index d661734df..4b4a52dfb 100644
--- a/lib/WebGUI/Form/SelectBox.pm
+++ b/lib/WebGUI/Form/SelectBox.pm
@@ -68,7 +68,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/SelectList.pm b/lib/WebGUI/Form/SelectList.pm
index 7a034e462..c160ecc79 100644
--- a/lib/WebGUI/Form/SelectList.pm
+++ b/lib/WebGUI/Form/SelectList.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Submit.pm b/lib/WebGUI/Form/Submit.pm
index 416cba507..bad7aebe4 100644
--- a/lib/WebGUI/Form/Submit.pm
+++ b/lib/WebGUI/Form/Submit.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index b3fbc2ebb..c8ae8be6e 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -63,7 +63,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, 'Asset_Template');
 	push(@{$definition}, {
@@ -131,7 +131,7 @@ editing the template show up if the user is allowed to do that.
 
 sub setManageIcons {
 	my $self = shift;
-	my $template = WebGUI::Asset::Template->new($self->get('value'));
+	my $template = WebGUI::Asset::Template->new($self->session,$self->get('value'));
         if (defined $template && $template->canEdit) {
                 my $returnUrl;
                 if (defined $self->session->asset && ref $self->session->asset eq "WebGUI::Asset::Template") {
diff --git a/lib/WebGUI/Form/Text.pm b/lib/WebGUI/Form/Text.pm
index eed96ca0d..5319e2e22 100644
--- a/lib/WebGUI/Form/Text.pm
+++ b/lib/WebGUI/Form/Text.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm
index fec8cdc97..ff69c7bf6 100644
--- a/lib/WebGUI/Form/Textarea.pm
+++ b/lib/WebGUI/Form/Textarea.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm
index 0b2c4cedd..b9a5f5405 100644
--- a/lib/WebGUI/Form/TimeField.pm
+++ b/lib/WebGUI/Form/TimeField.pm
@@ -64,7 +64,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
@@ -113,6 +113,7 @@ sub toHtml {
 	$self->get("extras") .= ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"';
 	return $self->SUPER::toHtml
 		.WebGUI::Form::Button->new(
+			$self->session,
 			id=>$self->get('id'),
 			extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->config->get("extrasURL"). '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
 			value=>$i18n->get(970)
diff --git a/lib/WebGUI/Form/TimeZone.pm b/lib/WebGUI/Form/TimeZone.pm
index 26f346a5e..3be3635e8 100644
--- a/lib/WebGUI/Form/TimeZone.pm
+++ b/lib/WebGUI/Form/TimeZone.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Url.pm b/lib/WebGUI/Form/Url.pm
index 08bd66279..8b763e621 100644
--- a/lib/WebGUI/Form/Url.pm
+++ b/lib/WebGUI/Form/Url.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/WhatNext.pm b/lib/WebGUI/Form/WhatNext.pm
index cf32a2329..1cfe5c665 100644
--- a/lib/WebGUI/Form/WhatNext.pm
+++ b/lib/WebGUI/Form/WhatNext.pm
@@ -58,7 +58,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/YesNo.pm b/lib/WebGUI/Form/YesNo.pm
index 5d7d24d30..204a30b9c 100644
--- a/lib/WebGUI/Form/YesNo.pm
+++ b/lib/WebGUI/Form/YesNo.pm
@@ -59,7 +59,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Zipcode.pm b/lib/WebGUI/Form/Zipcode.pm
index 9d1808c07..dac4b93e2 100644
--- a/lib/WebGUI/Form/Zipcode.pm
+++ b/lib/WebGUI/Form/Zipcode.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index 0f0bf9a86..9df16b07d 100755
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -431,7 +431,7 @@ The name of the group you wish to instantiate.
 
 sub find {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $name = shift;
 	my ($groupId) = $session->db->quickArray("select groupId from groups where groupName=".$session->db->quote($name));
 	return WebGUI::Group->new($session,$groupId);
diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm
index 1ad38a2b4..714af96af 100644
--- a/lib/WebGUI/HTML.pm
+++ b/lib/WebGUI/HTML.pm
@@ -242,7 +242,7 @@ The base URL to use. Defaults to current page's url.
 my $absolute = "";
                                                                                                  
 sub makeAbsolute {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $html = shift;
 	my $baseURL = shift; 
 
@@ -321,7 +321,7 @@ The content to be processed through the replacements filter.
 =cut
 
 sub processReplacements {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($content) = @_;
 	my $replacements = $session->stow->get("replacements");
 	if (defined $replacements) {
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 77f0d9bf8..fe71a68c0 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -142,7 +142,7 @@ If you want to add anything special to the form's table like a name or styleshee
 sub new {
 	my ($header, $footer);
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %param = @_;
 	$header = "\n\n".WebGUI::Form::formHeader($session,{
 		action=>($param{action} || $param{'-action'} || $session->url->page),
diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm
index 9024ac5ca..c54b2d8e7 100644
--- a/lib/WebGUI/Help/Macros.pm
+++ b/lib/WebGUI/Help/Macros.pm
@@ -22,7 +22,7 @@ our $HELP = {
 		fields => [
 		],
 		related => sub {   ##Hey, you gotta pass in the session var, right?
-			     my $session = shift;
+			     my $session = shift; use WebGUI; WebGUI::dumpSession($session);
                              sort { $a->{tag} cmp $b->{tag} }
                              map {
                                  $tag = $_;
diff --git a/lib/WebGUI/International.pm b/lib/WebGUI/International.pm
index f1019767f..3dc468955 100644
--- a/lib/WebGUI/International.pm
+++ b/lib/WebGUI/International.pm
@@ -29,9 +29,15 @@ This package provides an interface to the internationalization system.
 =head1 SYNOPSIS
 
  use WebGUI::International;
- my $i = WebGUI::International->new($session, $namespace);
- $hashRef = $i->getLanguage($lang);
- $hashRef = $i->getLanguages();
+ $string = WebGUI::International::get($session,$internationalId,$namespace);
+ $hashRef = WebGUI::International::getLanguage($session,$lang);
+ $hashRef = WebGUI::International::getLanguages($session,);
+ $url = WebGUI::International::makeUrlCompliant($session,$url);
+
+This package can also be used in object-oriented (OO) style.
+
+ use WebGUI::International;
+ my $i = WebGUI::International->new($session,$namespace);
  $string = $i->get($internationalId);
  $url = $i->makeUrlCompliant($url);
 
@@ -181,9 +187,9 @@ sub makeUrlCompliant {
 
 =head2 new ( session, [ namespace, language ] ) 
 
-The constructor for the International function if using it in OO mode.
-Note that namespace and languages are defaults; they may be overridden
-in all accessor methods, (get, getLanguage).
+The constructor for the International function if using it in OO mode.  Note
+that namespace and languages are defaults; they may be overridden in
+all accessor methods, (get, getLanguage).
 
 =head3 session
 
diff --git a/lib/WebGUI/LDAPLink.pm b/lib/WebGUI/LDAPLink.pm
index 5339add6e..bab464cb8 100644
--- a/lib/WebGUI/LDAPLink.pm
+++ b/lib/WebGUI/LDAPLink.pm
@@ -152,7 +152,7 @@ A reference to the current session.
 
 sub getList {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
     my %list;
 	tie %list, "Tie::IxHash";
 	%list = $session->db->buildHash("select ldapLinkId, ldapLinkName from ldapLink order by ldapLinkName");
@@ -195,7 +195,7 @@ The ldapLinkId of the ldapLink you're creating an object reference for.
 sub new {
     my ( $ldapLinkId, $ldapLink);
     my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$ldapLinkId = shift;
 	return undef unless $ldapLinkId;
 	$ldapLink = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($ldapLinkId));
diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm
index 8cc816b7b..564a2c0d1 100644
--- a/lib/WebGUI/Macro.pm
+++ b/lib/WebGUI/Macro.pm
@@ -118,7 +118,7 @@ A scalar reference of HTML to be processed.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    	my $content = shift;
    	while ($$content =~ /$nestedMacro/gs) {
       		my ($macro, $searchString, $params) = ($1, $2, $3);
diff --git a/lib/WebGUI/Macro/AOIHits.pm b/lib/WebGUI/Macro/AOIHits.pm
index 072b8e3bb..5fbf5bfe8 100644
--- a/lib/WebGUI/Macro/AOIHits.pm
+++ b/lib/WebGUI/Macro/AOIHits.pm
@@ -35,7 +35,7 @@ The value for the key that will be looked up.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = shift; 
 	my $value = shift;
 	my $sql = "select count from passiveProfileAOI a, metaData_properties f 
diff --git a/lib/WebGUI/Macro/AOIRank.pm b/lib/WebGUI/Macro/AOIRank.pm
index 750731e82..7e116d78f 100644
--- a/lib/WebGUI/Macro/AOIRank.pm
+++ b/lib/WebGUI/Macro/AOIRank.pm
@@ -35,7 +35,7 @@ Define which value, by it's ranking, will be displayed.  The highest ranking is
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $key = shift;
 	my $rank = shift || 1; # 1 is highest rank
 	$rank--;	# Rank is zero based
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 8e5f9753e..25c8ff159 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -41,7 +41,7 @@ Admin bar to the left of the screen.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" unless ($session->var->isAdminOn);
 	my @param = @_;
         my $templateId = $param[0] || "PBtmpl0000000000000090";
diff --git a/lib/WebGUI/Macro/AdminText.pm b/lib/WebGUI/Macro/AdminText.pm
index 07ce24057..ee2642f4e 100644
--- a/lib/WebGUI/Macro/AdminText.pm
+++ b/lib/WebGUI/Macro/AdminText.pm
@@ -31,7 +31,7 @@ string is returned.
 
 #-------------------------------------------------------------------
 sub process {	
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
         return "" unless ($session->var->get("adminOn"));
         return $param[0];
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 8bbb756ab..860a79bd3 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -45,7 +45,7 @@ A template from the Macro/AdminToggle namespace to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
          if ($session->user->isInGroup(12)) {
         	my %var;
                  my ($turnOn,$turnOff,$templateName) = @_;
diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index 62db526d6..5c938663b 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -37,7 +37,7 @@ Admin is turned on.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $t = [Time::HiRes::gettimeofday()] if ($session->errorHandler->canShowPerformanceIndicators());
 	my $asset = WebGUI::Asset->newByUrl($session,$url);
diff --git a/lib/WebGUI/Macro/At_username.pm b/lib/WebGUI/Macro/At_username.pm
index 113b4e29c..dbd6cc075 100644
--- a/lib/WebGUI/Macro/At_username.pm
+++ b/lib/WebGUI/Macro/At_username.pm
@@ -26,7 +26,7 @@ Macro for displaying the current User's username.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->user->username;
 }
 
diff --git a/lib/WebGUI/Macro/CanEditText.pm b/lib/WebGUI/Macro/CanEditText.pm
index 90f94fc87..10175f3b1 100644
--- a/lib/WebGUI/Macro/CanEditText.pm
+++ b/lib/WebGUI/Macro/CanEditText.pm
@@ -33,7 +33,7 @@ this asset, an empty string will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	if ($session->asset && $session->asset->canEdit) { 
 		return $param[0];
diff --git a/lib/WebGUI/Macro/D_date.pm b/lib/WebGUI/Macro/D_date.pm
index fa5ba84f1..488d90cd0 100644
--- a/lib/WebGUI/Macro/D_date.pm
+++ b/lib/WebGUI/Macro/D_date.pm
@@ -37,7 +37,7 @@ time is used instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my (@param, $temp, $time);
         @param = @_;
 	$time = $param[1] ||$session->datetime->time();
diff --git a/lib/WebGUI/Macro/EditableToggle.pm b/lib/WebGUI/Macro/EditableToggle.pm
index 68e446f61..dba3c36ad 100644
--- a/lib/WebGUI/Macro/EditableToggle.pm
+++ b/lib/WebGUI/Macro/EditableToggle.pm
@@ -48,7 +48,7 @@ A template from the Macro/EditableToggle namespace to use for formatting the lin
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
          if ($session->asset && $session->asset->canEdit && $session->user->isInGroup(12)) {
         	my %var;
               my @param = @_;
diff --git a/lib/WebGUI/Macro/Env.pm b/lib/WebGUI/Macro/Env.pm
index 670a1488b..28d3d3022 100644
--- a/lib/WebGUI/Macro/Env.pm
+++ b/lib/WebGUI/Macro/Env.pm
@@ -31,7 +31,7 @@ then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->env->get(shift);
 }
 
diff --git a/lib/WebGUI/Macro/Execute.pm b/lib/WebGUI/Macro/Execute.pm
index de2d94b6a..0e38cf437 100644
--- a/lib/WebGUI/Macro/Execute.pm
+++ b/lib/WebGUI/Macro/Execute.pm
@@ -33,7 +33,7 @@ be blocked and an error message returned instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /\.conf/) {
 		my $i18n = WebGUI::International->new($session, 'Macro_Execute');
diff --git a/lib/WebGUI/Macro/Extras.pm b/lib/WebGUI/Macro/Extras.pm
index 32a37f3e9..6328a708e 100644
--- a/lib/WebGUI/Macro/Extras.pm
+++ b/lib/WebGUI/Macro/Extras.pm
@@ -29,7 +29,7 @@ Returns the extrasURL.  A trailing slash '/' is appended to the URL.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->config->get("extrasURL")."/";
 }
 
diff --git a/lib/WebGUI/Macro/FetchMimeType.pm b/lib/WebGUI/Macro/FetchMimeType.pm
index ffd8cde70..0dd66a598 100644
--- a/lib/WebGUI/Macro/FetchMimeType.pm
+++ b/lib/WebGUI/Macro/FetchMimeType.pm
@@ -35,7 +35,7 @@ A path to a file
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $path = shift;
 	return guess_media_type($path);
 }
diff --git a/lib/WebGUI/Macro/FileUrl.pm b/lib/WebGUI/Macro/FileUrl.pm
index 4abfc23e9..99a01355c 100644
--- a/lib/WebGUI/Macro/FileUrl.pm
+++ b/lib/WebGUI/Macro/FileUrl.pm
@@ -40,7 +40,7 @@ The URL to the Asset.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $asset = WebGUI::Asset->newByUrl($session,$url);
 	if (defined $asset) {
diff --git a/lib/WebGUI/Macro/FormParam.pm b/lib/WebGUI/Macro/FormParam.pm
index 9139b9223..7f07339f1 100644
--- a/lib/WebGUI/Macro/FormParam.pm
+++ b/lib/WebGUI/Macro/FormParam.pm
@@ -32,7 +32,7 @@ The name of the field to pull from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->form->process(shift);
 }
 
diff --git a/lib/WebGUI/Macro/GroupAdd.pm b/lib/WebGUI/Macro/GroupAdd.pm
index 6cd1897d7..a53c5d1aa 100644
--- a/lib/WebGUI/Macro/GroupAdd.pm
+++ b/lib/WebGUI/Macro/GroupAdd.pm
@@ -44,7 +44,7 @@ An optional template for formatting the text and link.
 #-------------------------------------------------------------------
 sub process {
 	my @param = @_;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");
 	return "" if ($session->user->userId eq '1');
diff --git a/lib/WebGUI/Macro/GroupDelete.pm b/lib/WebGUI/Macro/GroupDelete.pm
index 5116102c8..6bc54bb77 100644
--- a/lib/WebGUI/Macro/GroupDelete.pm
+++ b/lib/WebGUI/Macro/GroupDelete.pm
@@ -43,7 +43,7 @@ An optional template for formatting the text and link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");
diff --git a/lib/WebGUI/Macro/GroupText.pm b/lib/WebGUI/Macro/GroupText.pm
index a2726a803..eb714f618 100644
--- a/lib/WebGUI/Macro/GroupText.pm
+++ b/lib/WebGUI/Macro/GroupText.pm
@@ -41,7 +41,7 @@ Text to be shown to someone not in the group.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @param = @_;
 	my ($groupId) = $session->dbSlave->quickArray("select groupId from groups where groupName=".$session->db->quote($param[0]));
 	$groupId = 3 if ($groupId eq "");
diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm
index a817333db..603084c01 100644
--- a/lib/WebGUI/Macro/H_homeLink.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -42,7 +42,7 @@ be used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($label, $templateUrl) = @_;
 	my $home = WebGUI::Asset->getDefault($session);
 	if ($label ne "linkonly") {
diff --git a/lib/WebGUI/Macro/Hash_userId.pm b/lib/WebGUI/Macro/Hash_userId.pm
index 5dd1b41b8..058a8002b 100644
--- a/lib/WebGUI/Macro/Hash_userId.pm
+++ b/lib/WebGUI/Macro/Hash_userId.pm
@@ -29,7 +29,7 @@ Returns the userId from the session variable for the current user.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->user->userId;
 }
 
diff --git a/lib/WebGUI/Macro/Include.pm b/lib/WebGUI/Macro/Include.pm
index 69b363402..fa1e5112e 100644
--- a/lib/WebGUI/Macro/Include.pm
+++ b/lib/WebGUI/Macro/Include.pm
@@ -36,7 +36,7 @@ The complete path to a file in the local filesystem.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my (@param, $temp, $file);
         @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_Include');
diff --git a/lib/WebGUI/Macro/JavaScript.pm b/lib/WebGUI/Macro/JavaScript.pm
index 6a5a5049f..8e6c54ca6 100644
--- a/lib/WebGUI/Macro/JavaScript.pm
+++ b/lib/WebGUI/Macro/JavaScript.pm
@@ -33,7 +33,7 @@ URL to the javascript to include in the page's header tags.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setScript(shift,{type=>'text/javascript'});
 	return "";
 }
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index 2fae8a8d8..a1ad87879 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -36,7 +36,7 @@ text to wrap in a link for logging out.
 
 #-------------------------------------------------------------------
 sub _createURL {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $text = shift;
 	return '<a href="'.$session->url->page("op=auth;method=logout").'">'.$text.'</a>';
 }
@@ -61,7 +61,7 @@ The ID of a template for custom layout of the login box and text.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	my $templateId = $param[2] || "PBtmpl0000000000000044";
 	my %var;	
diff --git a/lib/WebGUI/Macro/LastModified.pm b/lib/WebGUI/Macro/LastModified.pm
index 054814271..bc4b19df1 100644
--- a/lib/WebGUI/Macro/LastModified.pm
+++ b/lib/WebGUI/Macro/LastModified.pm
@@ -39,7 +39,7 @@ sprintf.  See L<WebGUI::DateTime/"epochToHuman"> for a list of codes.  Uses
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return '' unless $session->asset;
 	my ($label, $format, $time);
 	($label, $format) = @_;
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 96ae053b4..3635ffaf1 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -45,7 +45,7 @@ The ID of a template for custom layout of the link and text.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_LoginToggle');
         my $login = $param[0] || $i18n->get(716);
diff --git a/lib/WebGUI/Macro/Page.pm b/lib/WebGUI/Macro/Page.pm
index 5e7ff1835..37706b846 100644
--- a/lib/WebGUI/Macro/Page.pm
+++ b/lib/WebGUI/Macro/Page.pm
@@ -33,7 +33,7 @@ The name of the property to retrieve from the assset via $session->asset->get()
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		return $session->asset->get(shift);
 	}
diff --git a/lib/WebGUI/Macro/PageTitle.pm b/lib/WebGUI/Macro/PageTitle.pm
index 4227df80b..f6ea52bae 100644
--- a/lib/WebGUI/Macro/PageTitle.pm
+++ b/lib/WebGUI/Macro/PageTitle.pm
@@ -30,7 +30,7 @@ no asset cached in the session variable, nothing is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		if ($session->form->process("op") || $session->form->process("func")) {
 	        	return '<a href="'.$session->asset->getUrl.'">'.$session->asset->get("title").'</a>';
diff --git a/lib/WebGUI/Macro/PageUrl.pm b/lib/WebGUI/Macro/PageUrl.pm
index d8380a330..cf859e0bf 100644
--- a/lib/WebGUI/Macro/PageUrl.pm
+++ b/lib/WebGUI/Macro/PageUrl.pm
@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->page();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page();
 }
 
diff --git a/lib/WebGUI/Macro/Product.pm b/lib/WebGUI/Macro/Product.pm
index 7f00c68bc..dbe0961f4 100644
--- a/lib/WebGUI/Macro/Product.pm
+++ b/lib/WebGUI/Macro/Product.pm
@@ -27,7 +27,7 @@ is left blank, a default template from the Macro/Product namespace will be used.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (@param, $productId, $variantId, $product, $variant, $output, $templateId, @variantLoop, %var);
 	
 	@param = @_;
diff --git a/lib/WebGUI/Macro/Quote.pm b/lib/WebGUI/Macro/Quote.pm
index c03fc9c2c..39e175ec5 100644
--- a/lib/WebGUI/Macro/Quote.pm
+++ b/lib/WebGUI/Macro/Quote.pm
@@ -32,7 +32,7 @@ The text to quote.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->db->quote(shift);
 	
 }
diff --git a/lib/WebGUI/Macro/RandomAssetProxy.pm b/lib/WebGUI/Macro/RandomAssetProxy.pm
index bb794fb47..1e620e3e9 100644
--- a/lib/WebGUI/Macro/RandomAssetProxy.pm
+++ b/lib/WebGUI/Macro/RandomAssetProxy.pm
@@ -34,7 +34,7 @@ if no asset exists at that url, or if the asset has no children.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	my $i18n = WebGUI::International->new($session,'Macro_RandomAssetProxy');
 	my $asset = WebGUI::Asset->newByUrl($session, $url);
diff --git a/lib/WebGUI/Macro/RandomThread.pm b/lib/WebGUI/Macro/RandomThread.pm
index 1fe1262c7..98c5eb74a 100644
--- a/lib/WebGUI/Macro/RandomThread.pm
+++ b/lib/WebGUI/Macro/RandomThread.pm
@@ -57,7 +57,7 @@ URL of the template to use to display the random thread. Must be a valid URL wit
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($startURL, $relatives, $templateURL) = @_;
 	# Seed the randomizer:
 	srand;
@@ -129,7 +129,7 @@ Reference to an array with lineage of Collaboration Systems to select a random t
 =cut
 
 sub _getRandomThread {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $lineage = shift;
 
 	# Get random CS:
diff --git a/lib/WebGUI/Macro/RawHeadTags.pm b/lib/WebGUI/Macro/RawHeadTags.pm
index cb3bf0df7..d80897ba7 100644
--- a/lib/WebGUI/Macro/RawHeadTags.pm
+++ b/lib/WebGUI/Macro/RawHeadTags.pm
@@ -32,7 +32,7 @@ Text that will be added to the HEAD tags for this page.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setRawHeadTags(shift);
 	return "";
 }
diff --git a/lib/WebGUI/Macro/RootTitle.pm b/lib/WebGUI/Macro/RootTitle.pm
index 40b63eab0..154698b9a 100644
--- a/lib/WebGUI/Macro/RootTitle.pm
+++ b/lib/WebGUI/Macro/RootTitle.pm
@@ -31,7 +31,7 @@ is returned.  Otherwise a space is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->asset) {
 		my $lineage = $session->asset->get("lineage");
 		$lineage = substr($lineage,0,6);
diff --git a/lib/WebGUI/Macro/SQL.pm b/lib/WebGUI/Macro/SQL.pm
index 1ef57bb37..1f14e2d27 100644
--- a/lib/WebGUI/Macro/SQL.pm
+++ b/lib/WebGUI/Macro/SQL.pm
@@ -38,7 +38,7 @@ be used to position its output in the format.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($output, @data, $rownum, $temp);
 	my ($statement, $format) = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_SQL');
diff --git a/lib/WebGUI/Macro/Slash_gatewayUrl.pm b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
index 73a37e4b5..f7ee3d241 100644
--- a/lib/WebGUI/Macro/Slash_gatewayUrl.pm
+++ b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->gateway();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->gateway();
 }
 
diff --git a/lib/WebGUI/Macro/Spacer.pm b/lib/WebGUI/Macro/Spacer.pm
index 08e4275e5..501af8c35 100644
--- a/lib/WebGUI/Macro/Spacer.pm
+++ b/lib/WebGUI/Macro/Spacer.pm
@@ -38,7 +38,7 @@ Set the height of the spacer.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($output, @param, $width, $height);
         @param = @_;
         $width = $param[0] if defined $param[0];
diff --git a/lib/WebGUI/Macro/Splat_random.pm b/lib/WebGUI/Macro/Splat_random.pm
index c5d819b34..0bc072c42 100644
--- a/lib/WebGUI/Macro/Splat_random.pm
+++ b/lib/WebGUI/Macro/Splat_random.pm
@@ -34,7 +34,7 @@ used as a default.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($temp, @param);
         @param = @_;
         if ($param[0] ne "") {
diff --git a/lib/WebGUI/Macro/StyleSheet.pm b/lib/WebGUI/Macro/StyleSheet.pm
index 81f1c2ab1..d88821f2b 100644
--- a/lib/WebGUI/Macro/StyleSheet.pm
+++ b/lib/WebGUI/Macro/StyleSheet.pm
@@ -32,7 +32,7 @@ The URL to the CSS document.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->setLink(shift,{
 		type=>'text/css',
 		rel=>'stylesheet'
diff --git a/lib/WebGUI/Macro/SubscriptionItem.pm b/lib/WebGUI/Macro/SubscriptionItem.pm
index fe2ef4b71..ba0c65c24 100644
--- a/lib/WebGUI/Macro/SubscriptionItem.pm
+++ b/lib/WebGUI/Macro/SubscriptionItem.pm
@@ -28,7 +28,7 @@ be used from the Macro/SubscriptionItem namespace.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($subscriptionId, $templateId, %var);
 	($subscriptionId, $templateId) = @_;
 	%var = $session->db->quickHash('select * from subscription where subscriptionId='.$session->db->quote($subscriptionId));
diff --git a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
index 83ef582e3..097274923 100644
--- a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
+++ b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
@@ -22,7 +22,7 @@ The ID of the subscription item to purchase.
 =cut
 
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page('op=purchaseSubscription;sid='.shift);
 }
 
diff --git a/lib/WebGUI/Macro/Thumbnail.pm b/lib/WebGUI/Macro/Thumbnail.pm
index a702a6315..04d516760 100644
--- a/lib/WebGUI/Macro/Thumbnail.pm
+++ b/lib/WebGUI/Macro/Thumbnail.pm
@@ -32,7 +32,7 @@ Image Asset can be found with that URL, then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $url = shift;
 	if (my $image = WebGUI::Asset::File::Image->newByUrl($session,$url)) {
 	        return $image->getThumbnailUrl;
diff --git a/lib/WebGUI/Macro/URLEncode.pm b/lib/WebGUI/Macro/URLEncode.pm
index bcaf4a1cd..8028ba05c 100644
--- a/lib/WebGUI/Macro/URLEncode.pm
+++ b/lib/WebGUI/Macro/URLEncode.pm
@@ -33,7 +33,7 @@ The text to URL encode.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->escape(shift);
 }
 
diff --git a/lib/WebGUI/Macro/User.pm b/lib/WebGUI/Macro/User.pm
index 3c3fc4200..4f0d01156 100644
--- a/lib/WebGUI/Macro/User.pm
+++ b/lib/WebGUI/Macro/User.pm
@@ -29,7 +29,7 @@ the data stored in $session .  If the field does not exist, undef is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return  $session->user->profileField(shift);
 }
 
diff --git a/lib/WebGUI/Macro/a_account.pm b/lib/WebGUI/Macro/a_account.pm
index 453f36815..128a91772 100644
--- a/lib/WebGUI/Macro/a_account.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -39,7 +39,7 @@ A template to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %var;
 	my  @param = @_;
 	return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");
diff --git a/lib/WebGUI/Macro/c_companyName.pm b/lib/WebGUI/Macro/c_companyName.pm
index d3e0a0b4f..f90ab29a3 100644
--- a/lib/WebGUI/Macro/c_companyName.pm
+++ b/lib/WebGUI/Macro/c_companyName.pm
@@ -28,7 +28,7 @@ returns the companyName from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyName");
 }
 
diff --git a/lib/WebGUI/Macro/e_companyEmail.pm b/lib/WebGUI/Macro/e_companyEmail.pm
index cfe85b466..94373adcb 100644
--- a/lib/WebGUI/Macro/e_companyEmail.pm
+++ b/lib/WebGUI/Macro/e_companyEmail.pm
@@ -28,7 +28,7 @@ returns the companyEmail from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyEmail");
 }
 
diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm
index 4049f641d..f2b8960d7 100644
--- a/lib/WebGUI/Macro/r_printable.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -49,7 +49,7 @@ is used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($temp, @param, $styleId);
         @param = @_;
 	my $append = 'op=makePrintable';
diff --git a/lib/WebGUI/Macro/u_companyUrl.pm b/lib/WebGUI/Macro/u_companyUrl.pm
index 36eecd3be..46c0ff553 100644
--- a/lib/WebGUI/Macro/u_companyUrl.pm
+++ b/lib/WebGUI/Macro/u_companyUrl.pm
@@ -29,7 +29,7 @@ returns the companyURL from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->setting->get("companyURL");
 }
 
diff --git a/lib/WebGUI/Operation.pm b/lib/WebGUI/Operation.pm
index 37c9e7cef..1a7e80fa3 100644
--- a/lib/WebGUI/Operation.pm
+++ b/lib/WebGUI/Operation.pm
@@ -48,7 +48,7 @@ The name of the operation to execute.
 =cut
 
 sub execute {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $op = shift;
 	my ($output, $cmd);
 	my $operation = getOperations();
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index 4e10eb1f0..0db91d73a 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -37,7 +37,7 @@ $session->form->process("sid").  Afterwards, it calls www_viewActiveSessions.
 =cut
 
 sub www_killSession {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return www_viewActiveSessions() if $session->form->process("sid") eq $session->var->get("sessionId");
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::Session::end($session->form->process("sid"));
@@ -54,7 +54,7 @@ delete (kill) each one via www_killSession
 =cut
 
 sub www_viewActiveSessions {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
diff --git a/lib/WebGUI/Operation/Admin.pm b/lib/WebGUI/Operation/Admin.pm
index d12eba1d2..83646f311 100644
--- a/lib/WebGUI/Operation/Admin.pm
+++ b/lib/WebGUI/Operation/Admin.pm
@@ -32,9 +32,9 @@ If the current user is in the Turn On Admin Group, then return an Admin Console.
 =cut
 
 sub www_adminConsole {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" unless ($session->user->isInGroup(12));
-	my $ac = WebGUI::AdminConsole->new;
+	my $ac = WebGUI::AdminConsole->new($session);
 	return $ac->render;
 }
 
@@ -49,7 +49,7 @@ via WebGUI::Session::switchAdminOff()
 =cut
 
 sub www_switchOffAdmin {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" unless ($session->user->isInGroup(12));
 	WebGUI::Session::switchAdminOff();
 	return "";
@@ -65,7 +65,7 @@ via WebGUI::Session::switchAdminOn()
 =cut
 
 sub www_switchOnAdmin {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return "" unless ($session->user->isInGroup(12));
 	WebGUI::Session::switchAdminOn();
 	return "";
diff --git a/lib/WebGUI/Operation/Auth.pm b/lib/WebGUI/Operation/Auth.pm
index 14c46c133..bc01f08c8 100644
--- a/lib/WebGUI/Operation/Auth.pm
+++ b/lib/WebGUI/Operation/Auth.pm
@@ -30,7 +30,7 @@ Get the instance of this object or create a new instance if none exists
 =cut
 
 sub getInstance {
-	my $session = shift;   
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);   
    	#Get Auth Settings
 	my $authMethod = $session->user->authMethod || $session->setting->get("authMethod");
 	$authMethod = $session->setting->get("authMethod") if($session->user->userId eq '1');
@@ -58,7 +58,7 @@ is returned.
 =cut
 
 sub www_auth {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my $auth;
    ($auth) = $session->db->quickArray("select authMethod from users where username=".$session->db->quote($session->form->process("username"))) if($session->form->process("username"));
    my $authMethod = getInstance($session,$auth);
diff --git a/lib/WebGUI/Operation/Cache.pm b/lib/WebGUI/Operation/Cache.pm
index a74949930..1729afa5f 100644
--- a/lib/WebGUI/Operation/Cache.pm
+++ b/lib/WebGUI/Operation/Cache.pm
@@ -45,7 +45,7 @@ is looked up in the i18n table in the WebGUI namespace.
 =cut
 
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -74,7 +74,7 @@ Text description of how long the subscription lasts.
 =cut
 
 sub www_flushCache {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $cache = WebGUI::Cache->new($session,);
 	$cache->flush;
@@ -91,7 +91,7 @@ provides an option to clear the cache.
 =cut
 
 sub www_manageCache {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $data);
 	my $cache = WebGUI::Cache->new($session);
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index ca58e4b7b..35b4dba7e 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -20,7 +20,7 @@ use Storable;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session, "Commerce");
 
 	my $workarea = shift;
@@ -38,27 +38,27 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub _clearCheckoutScratch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	_clearShippingScratch();
 	_clearPaymentScratch();
 }
 
 #-------------------------------------------------------------------
 sub _clearPaymentScratch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->set('paymentGateway', '-delete-');
 }
 
 #-------------------------------------------------------------------
 sub _clearShippingScratch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->set('shippingMethod', '-delete-');
 	$session->scratch->set('shippingOptions', '-delete-');
 }
 
 #-------------------------------------------------------------------
 sub _paymentSelected {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return 0 unless ($session->scratch->get('paymentGateway'));
 	my $plugin = WebGUI::Commerce::Payment->load($session, $session->scratch->get('paymentGateway'));
 	return 1 if ($plugin && $plugin->enabled);
@@ -67,7 +67,7 @@ sub _paymentSelected {
 
 #-------------------------------------------------------------------
 sub _shippingSelected {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return 0 unless ($session->scratch->get('shippingMethod'));
 
 	my $plugin = WebGUI::Commerce::Shipping->load($session, $session->scratch->get('shippingMethod'));
@@ -81,7 +81,7 @@ sub _shippingSelected {
 
 #-------------------------------------------------------------------
 sub www_addToCart {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	WebGUI::Commerce::ShoppingCart->new($session)->add($session->form->process("itemId"), $session->form->process("itemType"), $session->form->process("quantity"));
 
 	return WebGUI::Operation::execute('viewCart');
@@ -89,7 +89,7 @@ sub www_addToCart {
 
 #-------------------------------------------------------------------
 sub www_cancelTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($transaction, %var);
 	
 	$transaction = WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"));
@@ -106,7 +106,7 @@ sub www_cancelTransaction {
 # This operation is here for easier future extensions to the commerce system.
 #-------------------------------------------------------------------
 sub www_checkout {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return WebGUI::Operation::execute('selectShippingMethod') unless (_shippingSelected);
 
 	return WebGUI::Operation::execute('selectPaymentGateway') unless (_paymentSelected);
@@ -116,7 +116,7 @@ sub www_checkout {
 
 #-------------------------------------------------------------------
 sub www_checkoutConfirm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($plugin, $f, %var, $errors, $i18n, $shoppingCart, $normal, $recurring, $shipping, $total);
 	$errors = shift;
 	
@@ -196,7 +196,7 @@ sub www_checkoutConfirm {
 
 #-------------------------------------------------------------------
 sub www_checkoutSubmit {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($plugin, $shoppingCart, $transaction, $var, $amount, @cartItems, $i18n, @transactions, 
 		@normal, $currentPurchase, $checkoutError, @resultLoop, %param, $normal, $recurring, 
 		$formError, $shipping, $shippingCost, $shippingDescription);
@@ -326,7 +326,7 @@ sub www_checkoutSubmit {
 
 #-------------------------------------------------------------------
 sub www_completePendingTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 
 	WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->completeTransaction;
@@ -336,7 +336,7 @@ sub www_completePendingTransaction {
 
 #-------------------------------------------------------------------
 sub www_confirmRecurringTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my($plugin, %var);
 	
 	$plugin = WebGUI::Commerce::Payment->load($session, $session->form->process("gateway"));
@@ -347,7 +347,7 @@ sub www_confirmRecurringTransaction {
 
 #-------------------------------------------------------------------
 sub www_confirmTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my($plugin, %var);
 	$plugin = WebGUI::Commerce::Payment->load($session, $session->form->process("pg"));
 
@@ -358,7 +358,7 @@ sub www_confirmTransaction {
 
 #-------------------------------------------------------------------
 sub www_deleteCartItem {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	WebGUI::Commerce::ShoppingCart->new($session)->delete($session->form->process("itemId"), $session->form->process("itemType"));
 
 	return WebGUI::Operation::execute('viewCart');
@@ -366,7 +366,7 @@ sub www_deleteCartItem {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettings {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (%tabs, $tabform, $currentPlugin, $ac, $jscript, $i18n, 
 		$paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin,
 		$shippingPlugin, @shippingPlugins, %shippingPlugins, @failedShippingPlugins);
@@ -510,7 +510,7 @@ sub www_editCommerceSettings {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettingsSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	foreach ($session->request->params) {
@@ -533,7 +533,7 @@ sub www_editCommerceSettingsSave {
 
 #-------------------------------------------------------------------
 sub www_listPendingTransactions {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($p, $transactions, $output, $properties, $i18n);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -566,7 +566,7 @@ sub www_listPendingTransactions {
 
 #-------------------------------------------------------------------
 sub www_listTransactions {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($output, %criteria, $transaction, @transactions);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
@@ -662,7 +662,7 @@ sub www_listTransactions {
 
 #-------------------------------------------------------------------
 sub www_selectPaymentGateway {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($plugins, $f, $i18n, @pluginLoop, %var);
 
 	_clearPaymentScratch;
@@ -695,7 +695,7 @@ sub www_selectPaymentGateway {
 
 #-------------------------------------------------------------------
 sub www_selectPaymentGatewaySave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if (WebGUI::Commerce::Payment->load($session, $session->form->process("paymentGateway"))->enabled) {
 		$session->scratch->set('paymentGateway', $session->form->process("paymentGateway"));
 	} else {
@@ -707,7 +707,7 @@ sub www_selectPaymentGatewaySave {
 
 #-------------------------------------------------------------------
 sub www_selectShippingMethod {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($plugins, $f, $i18n, @pluginLoop, %var);
 
 	_clearShippingScratch;
@@ -741,7 +741,7 @@ sub www_selectShippingMethod {
 
 #-------------------------------------------------------------------
 sub www_selectShippingMethodSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $shipping = WebGUI::Commerce::Shipping->load($session, $session->form->process("shippingMethod"));
 	
 	$shipping->processOptionsForm;
@@ -759,13 +759,13 @@ sub www_selectShippingMethodSave {
 
 #-------------------------------------------------------------------
 sub www_transactionComplete {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return WebGUI::Operation::execute('viewPurchaseHistory');	
 }
 
 #-------------------------------------------------------------------
 sub www_updateCart {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 my	$shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
 
 	foreach my $formElement ($session->request->params) {
@@ -779,7 +779,7 @@ my	$shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
 
 #-------------------------------------------------------------------
 sub www_viewCart {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($shoppingCart, $normal, $recurring, %var, $total, $i18n);
 
 	$i18n = WebGUI::International->new($session, 'Commerce');
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index c7792f2b0..f644b113c 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -18,7 +18,7 @@ use WebGUI::International;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -40,7 +40,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_copyDatabaseLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->copy;
         return www_listDatabaseLinks();
@@ -48,7 +48,7 @@ sub www_copyDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_deleteDatabaseLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
         my ($output);
@@ -63,7 +63,7 @@ sub www_deleteDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_deleteDatabaseLinkConfirm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->delete;
         return www_listDatabaseLinks();
@@ -71,7 +71,7 @@ sub www_deleteDatabaseLinkConfirm {
 
 #-------------------------------------------------------------------
 sub www_editDatabaseLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
         my ($output, %db, $f);
 	tie %db, 'Tie::CPHash';
@@ -128,7 +128,7 @@ sub www_editDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_editDatabaseLinkSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	my $params = {
 		title=>$session->form->process("title"),
@@ -146,7 +146,7 @@ sub www_editDatabaseLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listDatabaseLinks {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless($session->user->isInGroup(3));
 	my $links = WebGUI::DatabaseLinks->getList($session);
         my $output = '<table border="1" cellpadding="3" cellspacing="0" align="center">';
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index f023d4d10..9b35b3f82 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -16,8 +16,8 @@ use WebGUI::HTMLForm;
 
 #-------------------------------------------------------------------
 sub www_formAssetTree {
-	my $session = shift;
-	my $base = WebGUI::Asset->newByUrl || WebGUI::Asset->getRoot;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $base = WebGUI::Asset->newByUrl($session) || WebGUI::Asset->getRoot($session);
 	my @crumb;
 	my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1});
 	foreach my $ancestor (@{$ancestors}) {
@@ -46,7 +46,7 @@ sub www_formAssetTree {
 #-------------------------------------------------------------------
 
 sub www_richEditPageTree {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session);
 	my $f = WebGUI::HTMLForm->new($session,-action=>"#",-extras=>'name"linkchooser"');
 	$f->text(
@@ -80,7 +80,7 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url_
     }
 }
 </script><fieldset><legend>Pages</legend> ';
-	my $base = WebGUI::Asset->newByUrl || WebGUI::Asset->getRoot;
+	my $base = WebGUI::Asset->newByUrl($session) || WebGUI::Asset->getRoot($session);
 	my @crumb;
 	my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1});
 	foreach my $ancestor (@{$ancestors}) {
@@ -100,8 +100,8 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url_
 
 #-------------------------------------------------------------------
 sub www_richEditImageTree {
-	my $session = shift;
-	my $base = WebGUI::Asset->newByUrl || WebGUI::Asset->getRoot;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $base = WebGUI::Asset->newByUrl($session) || WebGUI::Asset->getRoot($session);
 	my @crumb;
 	my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1});
 	foreach my $ancestor (@{$ancestors}) {
@@ -125,8 +125,8 @@ sub www_richEditImageTree {
 
 #-------------------------------------------------------------------
 sub www_richEditViewThumbnail {
-	my $session = shift;
-	my $image = WebGUI::Asset->newByUrl;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $image = WebGUI::Asset->newByUrl($session);
 	$session->style->useEmptyStyle("1");
 	if ($image->get("className") =~ /WebGUI::Asset::File::Image/) {
 		my $output = '<div align="center">';
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 2956195e8..4dff4ef1d 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -25,7 +25,7 @@ use WebGUI::Utility;
 
 #-------------------------------------------------------------------
 sub _hasSecondaryPrivilege {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return 0 unless ($session->user->isInGroup(11));
 	my $group = WebGUI::Group->new($session,$_[0]);
 	return $group->userIsAdmin($session->user->userId);
@@ -34,7 +34,7 @@ sub _hasSecondaryPrivilege {
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -65,7 +65,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub doGroupSearch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $op = shift;
         my $returnPaginator = shift;
         my $groupFilter = shift;
@@ -94,7 +94,7 @@ sub doGroupSearch {
 
 #-------------------------------------------------------------------
 sub getGroupSearchForm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $op = shift;
 	my $params = shift;
 	$session->scratch->set("groupSearchKeyword",$session->form->process("keyword"));
@@ -139,7 +139,7 @@ sub getGroupSearchForm {
 
 #-------------------------------------------------------------------
 sub walkGroups {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $parentId = shift;
         my $indent = shift;
 	my $output;
@@ -157,8 +157,8 @@ sub walkGroups {
 
 #-------------------------------------------------------------------
 sub www_addGroupsToGroupSave {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$_[0]);
 	my @groups = $session->form->group('groups');
 	$group->addGroups(\@groups);
@@ -167,8 +167,8 @@ sub www_addGroupsToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSave {
-	my $session = shift;
-        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my @users = $session->form->selectList('users');
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
 	$group->addUsers(\@users);
@@ -177,7 +177,7 @@ sub www_addUsersToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_autoAddToGroup {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session->form->process("groupId"));
 	if ($group->autoAdd) {
@@ -188,7 +188,7 @@ sub www_autoAddToGroup {
 
 #-------------------------------------------------------------------
 sub www_autoDeleteFromGroup {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session->form->process("groupId"));
 	if ($group->autoDelete) {
@@ -199,8 +199,8 @@ sub www_autoDeleteFromGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroup {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
 	my $i18n = WebGUI::International->new($session);
         my ($output);
@@ -209,13 +209,13 @@ sub www_deleteGroup {
 		'">'.$i18n->get(44).'</a>';
         $output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$session->url->page('op=listGroups').'">'
 		.$i18n->get(45).'</a></div>';
-        return _submenu($output, '42',"group delete");
+        return _submenu($session,$output, '42',"group delete");
 }
 
 #-------------------------------------------------------------------
 sub www_deleteGroupConfirm {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
 	my $g = WebGUI::Group->new($session->form->process("gid"));
 	$g->delete;
@@ -224,8 +224,8 @@ sub www_deleteGroupConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupGrouping {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup('3') || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup('3') || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
 	$group->deleteGroups([$session->form->process("delete")]);
 	return www_manageGroupsInGroup();
@@ -243,15 +243,15 @@ perform this operation, and the
 =cut
 
 sub www_deleteGrouping {
-	my $session = shift;
-        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         if (($session->user->userId eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
                 return $session->privilege->vitalComponent();
         }
         my @users = $session->form->selectList('uid');
         my @groups = $session->form->group("gid");
         foreach my $user (@users) {
-                my $u = WebGUI::User->new($user);
+                my $u = WebGUI::User->new($session,$user);
                 $u->deleteFromGroups(\@groups);
         }
         return WebGUI::Operation::Group::www_manageUsersInGroup();
@@ -260,11 +260,11 @@ sub www_deleteGrouping {
 
 #-------------------------------------------------------------------
 sub www_editGroup {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my ($output, $f, $g);
 	if ($session->form->process("gid") eq "new") {
-		$g = WebGUI::Group->new("");
+		$g = WebGUI::Group->new($session,"");
 	} else {
 		$g = WebGUI::Group->new($session->form->process("gid"));
 	}
@@ -403,13 +403,13 @@ sub www_editGroup {
 		);
 	$f->submit;
 	$output .= $f->print;
-        return _submenu($output,'87',"group add/edit");
+        return _submenu($session,$output,'87',"group add/edit");
 }
 
 #-------------------------------------------------------------------
 sub www_editGroupSave {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $g = WebGUI::Group->new($session->form->process("gid"));
 	$g->description($session->form->process("description"));
 	$g->name($session->form->process("groupName"));
@@ -434,8 +434,8 @@ sub www_editGroupSave {
 
 #-------------------------------------------------------------------
 sub www_editGrouping {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $i18n = WebGUI::International->new($session);
 	my $f = WebGUI::HTMLForm->new($session);
         $f->hidden(
@@ -476,13 +476,13 @@ sub www_editGrouping {
 		-value=>$group->userIsAdmin($session->form->process("uid"))
 		);
 	$f->submit;
-        return _submenu($f->print,'370','grouping edit');
+        return _submenu($session,$f->print,'370','grouping edit');
 }
 
 #-------------------------------------------------------------------
 sub www_editGroupingSave {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
         $group->userGroupExpireDate($session->form->process("uid"),$session->datetime->setToEpoch($session->form->process("expireDate")));
         $group->userIsAdmin($session->form->process("uid"),$session->form->process("groupAdmin"));
@@ -491,8 +491,8 @@ sub www_editGroupingSave {
 
 #-------------------------------------------------------------------
 sub www_emailGroup {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my ($output,$f);
 	my $i18n = WebGUI::International->new($session);
 	$f = WebGUI::HTMLForm->new($session);
@@ -523,13 +523,13 @@ sub www_emailGroup {
 		);
 	$f->submit($i18n->get(810));
 	$output = $f->print;
-	return _submenu($output,'809');
+	return _submenu($session,$output,'809');
 }
 
 #-------------------------------------------------------------------
 sub www_emailGroupSend {
-	my $session = shift;
-	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my ($sth, $email);
 	$sth = $session->db->read("select b.fieldData from groupings a left join userProfileData b 
 		on a.userId=b.userId and b.fieldName='email' where a.groupId=".$session->db->quote($session->form->process("gid")));
@@ -540,17 +540,17 @@ sub www_emailGroupSend {
 	}
 	$sth->finish;
 	my $i18n = WebGUI::International->new($session);
-	return _submenu($i18n->get(812));
+	return _submenu($session,$i18n->get(812));
 }
 
 #-------------------------------------------------------------------
 sub www_listGroups {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session);
 	if ($session->user->isInGroup(3)) {
 		my $output = getGroupSearchForm("listGroups");
 		my ($groupCount) = $session->db->quickArray("select count(*) from groups where isEditable=1");
-        	return _submenu($output) unless ($session->form->process("doit") || $groupCount<250 || $session->form->process("pn") > 1);
+        	return _submenu($session,$output) unless ($session->form->process("doit") || $groupCount<250 || $session->form->process("pn") > 1);
 		$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 		$output .= '<tr><td class="tableHeader">'.$i18n->get(84).'</td><td class="tableHeader">'
 			.$i18n->get(85).'</td><td class="tableHeader">'
@@ -568,7 +568,7 @@ sub www_listGroups {
 		}
         	$output .= '</table>';
 		$output .= $p->getBarTraditional;
-		return _submenu($output,'',"groups manage");
+		return _submenu($session,$output,'',"groups manage");
 	} elsif ($session->user->isInGroup(11)) {
 		my ($output, $p, $sth, @data, @row, $i, $userCount);
         	my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->userId)." and groupAdmin=1");
@@ -595,7 +595,7 @@ sub www_listGroups {
         	$output .= $p->getPage($session->form->process("pn"));
         	$output .= '</table>';
         	$output .= $p->getBarTraditional($session->form->process("pn"));
-        	return _submenu($output,'89');
+        	return _submenu($session,$output,'89');
 	}
 	return $session->privilege->adminOnly();
 }
@@ -603,8 +603,8 @@ sub www_listGroups {
 
 #-------------------------------------------------------------------
 sub www_manageGroupsInGroup {
-	my $session = shift;
-        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my $f = WebGUI::HTMLForm->new($session);
         $f->hidden(
 		-name => "op",
@@ -631,13 +631,13 @@ sub www_manageGroupsInGroup {
         my $output = $f->print;
 	$output .= '<p />';
 	$output .= $session->walkGroups($session->form->process("gid"));
-	return _submenu($output,'813');
+	return _submenu($session,$output,'813');
 }
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroup {
-	my $session = shift;
-        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        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({
@@ -673,7 +673,7 @@ sub www_manageUsersInGroup {
 	$output .= '<p><h1>'.$i18n->get(976).'</h1>';
 	$output .= WebGUI::Operation::User::getUserSearchForm("manageUsersInGroup",{gid=>$session->form->process("gid")});
 	my ($userCount) = $session->db->quickArray("select count(*) from users");
-	return _submenu($output) unless ($session->form->process("doit") || $userCount < 250 || $session->form->process("pn") > 1);
+	return _submenu($session,$output) unless ($session->form->process("doit") || $userCount < 250 || $session->form->process("pn") > 1);
 	my $f = WebGUI::HTMLForm->new($session);
 	$f->hidden(
 		-name => "gid",
@@ -703,7 +703,7 @@ sub www_manageUsersInGroup {
 		);
 	$f->submit;
 	$output .= $f->print;
-        return _submenu($output,'88');
+        return _submenu($session,$output,'88');
 }
 
 
diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm
index 70a9323f0..b91ff5ac0 100644
--- a/lib/WebGUI/Operation/Help.pm
+++ b/lib/WebGUI/Operation/Help.pm
@@ -20,7 +20,7 @@ use WebGUI::Utility;
 
 #-------------------------------------------------------------------
 sub _load {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $namespace = shift;
 	$namespace =~ s/[^\w\d\s]//g;
 	my $cmd = "WebGUI::Help::".$namespace;
@@ -37,7 +37,7 @@ sub _load {
 
 #-------------------------------------------------------------------
 sub _get {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = shift;
 	my $namespace = shift;
 	my $help = _load($namespace);
@@ -51,19 +51,19 @@ sub _get {
 
 #-------------------------------------------------------------------
 sub _link {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page('op=viewHelp;hid='.$session->url->escape($_[0]).';namespace='.$_[1]);
 }
 
 #-------------------------------------------------------------------
 sub _linkTOC {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->url->page('op=viewHelpChapter;namespace='.$_[0]);
 }
 
 #-------------------------------------------------------------------
 sub _getHelpFilesList {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $dir = join '/', $session->config->getWebguiRoot,"lib","WebGUI","Help";
         opendir (DIR,$dir) or $session->errorHandler->fatal("Can't open Help directory!");
 	my @files;
@@ -79,7 +79,7 @@ sub _getHelpFilesList {
 
 #-------------------------------------------------------------------
 sub _getHelpName {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $file = shift;
 	my $helpName;
 	if ($file =~ /^Asset_/) {
@@ -108,7 +108,7 @@ sub _related {
 
 #-------------------------------------------------------------------
 sub www_viewHelp {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $ac = WebGUI::AdminConsole->new($session,"help");
 	my $namespace = $session->form->process("namespace") || "WebGUI";
@@ -126,7 +126,7 @@ sub www_viewHelp {
                         { 'title' =>       $i18n->get($row->{title},$row->{namespace}),
                           'description' => $i18n->get($row->{description},$row->{namespace}), }
         }
-        my $body = WebGUI::Asset::Template->new("PBtmplHelp000000000001")->process(\%vars);
+        my $body = WebGUI::Asset::Template->new($session,"PBtmplHelp000000000001")->process(\%vars);
     	$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),$i18n->get(95, 'WebGUI'));
     	$ac->addSubmenuItem($session->url->page('op=viewHelpTOC'),$i18n->get('help contents', 'WebGUI'));
 	WebGUI::Macro::process($session,\$body);
@@ -138,7 +138,7 @@ sub www_viewHelp {
 
 #-------------------------------------------------------------------
 sub www_viewHelpIndex {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $i18n = WebGUI::International->new($session);
         my @helpIndex;
@@ -173,7 +173,7 @@ sub www_viewHelpIndex {
 
 #-------------------------------------------------------------------
 sub www_viewHelpTOC {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
         my @helpIndex;
 	my $i;
@@ -204,7 +204,7 @@ sub www_viewHelpTOC {
 
 #-------------------------------------------------------------------
 sub www_viewHelpChapter {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $namespace = $session->form->process("namespace");
 	my $help = _load($namespace);
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index 40a4f2f9b..26dbfeb6a 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -20,7 +20,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session,"AuthLDAP");
@@ -46,7 +46,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_copyLDAPLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my (%db);
    tie %db, 'Tie::CPHash';
@@ -60,7 +60,7 @@ sub www_copyLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_deleteLDAPLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    $session->db->write("delete from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
    $session->form->process("op") = "listLDAPLinks";
@@ -69,7 +69,7 @@ sub www_deleteLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_editLDAPLink {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my ($output, %db, $f);
    tie %db, 'Tie::CPHash';
@@ -182,7 +182,7 @@ sub www_editLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_editLDAPLinkSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my $properties = {};
    $properties->{ldapLinkId} = $session->form->process("llid");
@@ -208,7 +208,7 @@ sub www_editLDAPLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listLDAPLinks {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    return $session->privilege->adminOnly() unless($session->user->isInGroup(3));
    my ($output, $p, $sth, $data, @row, $i);
 	my $i18n = WebGUI::International->new($session,"AuthLDAP");
diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm
index c52a19588..956f0bc21 100644
--- a/lib/WebGUI/Operation/LoginHistory.pm
+++ b/lib/WebGUI/Operation/LoginHistory.pm
@@ -34,7 +34,7 @@ they used.
 =cut
 
 sub www_viewLoginHistory {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/MessageLog.pm b/lib/WebGUI/Operation/MessageLog.pm
index 510ec4e4c..999cc9dcc 100644
--- a/lib/WebGUI/Operation/MessageLog.pm
+++ b/lib/WebGUI/Operation/MessageLog.pm
@@ -39,7 +39,7 @@ returns a hashref with internationalized values for message status.
 =cut
 
 sub _status {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session);
 	return {"notice"=>$i18n->get(551),"pending"=>$i18n->get(552),"completed"=>$i18n->get(350)};
 }
@@ -53,7 +53,7 @@ Templated display all messages for the current user.
 =cut
 
 sub www_viewMessageLog {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my (@msg, $vars);
    return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
@@ -99,7 +99,7 @@ Templated display of a single message for the user.
 =cut
 
 sub www_viewMessageLogMessage {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my ($data, $vars);
    return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index 0aa2587e2..7da80345c 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -12,7 +12,7 @@ use WebGUI::HTML;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session, "ProductManager");
 
 	my $workarea = shift;
@@ -36,7 +36,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProductParameterOption {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $optionId = $session->form->process("optionId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -48,7 +48,7 @@ sub www_deleteProductParameterOption {
 
 #-------------------------------------------------------------------
 sub www_deleteProductParameter {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $parameterId = $session->form->process("parameterId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -60,7 +60,7 @@ sub www_deleteProductParameter {
 
 #-------------------------------------------------------------------
 sub www_deleteProduct {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $productId = $session->form->process("productId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -72,7 +72,7 @@ sub www_deleteProduct {
 
 #-------------------------------------------------------------------
 sub www_editProduct {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($productId, $product, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -148,7 +148,7 @@ sub www_editProduct {
 
 #-------------------------------------------------------------------
 sub www_editProductSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($self, @error, $productId, $product, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -180,7 +180,7 @@ sub www_editProductSave {
 		
 #-------------------------------------------------------------------
 sub www_editProductParameter {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($parameterId, $product, $productId, $parameter, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -227,7 +227,7 @@ sub www_editProductParameter {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (@error, $parameterId, $product, $i18n, $skuTemplate, $oldName, $newName);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -266,7 +266,7 @@ sub www_editProductParameterSave {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterOption {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($self, $optionId, $option, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -330,7 +330,7 @@ sub www_editProductParameterOption {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterOptionSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($self, @error, $optionId, $product, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -357,7 +357,7 @@ sub www_editProductParameterOptionSave {
 
 #-------------------------------------------------------------------
 sub www_editProductVariant {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($variantId, $variant, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -411,7 +411,7 @@ sub www_editProductVariant {
 
 #-------------------------------------------------------------------
 sub www_editProductVariantSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 my	$variantId = $session->form->process("variantId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -423,7 +423,7 @@ my	$variantId = $session->form->process("variantId");
 
 #-------------------------------------------------------------------
 sub www_editSkuTemplate {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($product, $productId, $output, $f, $name, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -463,7 +463,7 @@ sub www_editSkuTemplate {
 
 #-------------------------------------------------------------------
 sub www_editSkuTemplateSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($productId) = $session->form->process("productId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -477,7 +477,7 @@ sub www_editSkuTemplateSave {
 
 #-------------------------------------------------------------------
 sub www_listProducts {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($self, $sth, $output, $row, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -505,7 +505,7 @@ sub www_listProducts {
 
 #-------------------------------------------------------------------
 sub www_listProductVariants {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($productId, $product, @variants, %parameters, %options, $output, %composition, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -568,7 +568,7 @@ sub www_listProductVariants {
 
 #-------------------------------------------------------------------
 sub www_listProductVariantsSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
 	
@@ -587,7 +587,7 @@ sub www_listProductVariantsSave {
 
 #-------------------------------------------------------------------
 sub www_manageProduct {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($productId, $product, $output, $parameter, $option, $optionId, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index f2ed9d3c7..07c782385 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -27,7 +27,7 @@ use WebGUI::Operation::Shared;
 #-------------------------------------------------------------------
 # Builds Extra form requirements for anonymous registration. 
 sub getRequiredProfileFields {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my @array;
 	foreach my $field (@{WebGUI::ProfileField->getRequiredFields}) {
 		push(@array, {
@@ -51,7 +51,7 @@ sub getRequiredProfileFields {
 =cut
 
 sub isDuplicateEmail {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $email = shift;
 	my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->userId));
 	return ($otherEmail > 0);
@@ -59,7 +59,7 @@ sub isDuplicateEmail {
 
 #-------------------------------------------------------------------
 sub saveProfileFields {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
    my $u = shift;
    my $profile = shift;
    
@@ -70,7 +70,7 @@ sub saveProfileFields {
 
 #-------------------------------------------------------------------
 sub validateProfileData {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my %data = ();
 	my $error = "";
 	my $warning = "";
@@ -93,7 +93,7 @@ sub validateProfileData {
 
 #-------------------------------------------------------------------
 sub www_editProfile {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return WebGUI::Operation::Auth::www_auth("init") if($session->user->userId eq '1');
 	my $i18n = WebGUI::International->new($session);
 	my $vars = {};
@@ -130,7 +130,7 @@ sub www_editProfile {
 
 #-------------------------------------------------------------------
 sub www_editProfileSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($profile, $fieldName, $error, $u, $warning);
 	return WebGUI::Operation::Auth::www_auth("init") if ($session->user->userId eq '1');
 	
@@ -149,7 +149,7 @@ sub www_editProfileSave {
 
 #-------------------------------------------------------------------
 sub www_viewProfile {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $u = WebGUI::User->new($session->form->process("uid"));
 	my $i18n = WebGUI::International->new($session);
 	my $vars = {};
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index ef0474b74..4b1704db6 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -21,7 +21,7 @@ use WebGUI::ProfileCategory;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $workarea = shift;
         my $title = shift;
         my $help = shift;
@@ -48,7 +48,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileCategoryConfirm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $category = WebGUI::ProfileCategory->new($session,$session->form->process("cid"));
         return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($category->isProtected);
@@ -58,7 +58,7 @@ sub www_deleteProfileCategoryConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileFieldConfirm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $field = WebGUI::ProfileField->new($session,$session->form->process("fid"));
         return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($field->isProtected);
@@ -68,7 +68,7 @@ sub www_deleteProfileFieldConfirm {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategory {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $data = {};
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
@@ -117,7 +117,7 @@ sub www_editProfileCategory {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategorySave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my %data = (
 		label=>$session->form->text("label"),
@@ -135,7 +135,7 @@ sub www_editProfileCategorySave {
 
 #-------------------------------------------------------------------
 sub www_editProfileField {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
         my $f = WebGUI::HTMLForm->new($session);
@@ -190,7 +190,7 @@ sub www_editProfileField {
 		-hoverHelp=>$i18n->get('474 description'),
 		-value=>$data->{required}
 		);
-	my $fieldType = WebGUI::Form::FieldType->new(
+	my $fieldType = WebGUI::Form::FieldType->new($session,
 		-name=>"fieldType",
 		-label=>$i18n->get(486),
 		-hoverHelp=>$i18n->get('486 description'),
@@ -237,7 +237,7 @@ sub www_editProfileField {
 
 #-------------------------------------------------------------------
 sub www_editProfileFieldSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my %data = (
 		label=>$session->form->text("label"),
@@ -262,7 +262,7 @@ sub www_editProfileFieldSave {
 
 #-------------------------------------------------------------------
 sub www_editProfileSettings {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
 	my $output = "";
@@ -287,7 +287,7 @@ sub www_editProfileSettings {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryDown {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileCategory->new($session,$session->form->process("cid"))->moveDown;
         return www_editProfileSettings();
@@ -295,7 +295,7 @@ sub www_moveProfileCategoryDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryUp {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileCategory->new($session,$session->form->process("cid"))->moveUp;
         return www_editProfileSettings();
@@ -303,7 +303,7 @@ sub www_moveProfileCategoryUp {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldDown {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileField->new($session,$session->form->process("fid"))->moveDown;
         return www_editProfileSettings();
@@ -311,7 +311,7 @@ sub www_moveProfileFieldDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldUp {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileField->new($session,$session->form->process("fid"))->moveUp;
         return www_editProfileSettings();
diff --git a/lib/WebGUI/Operation/Replacements.pm b/lib/WebGUI/Operation/Replacements.pm
index fa7c8e3b7..5f2cd8372 100644
--- a/lib/WebGUI/Operation/Replacements.pm
+++ b/lib/WebGUI/Operation/Replacements.pm
@@ -18,7 +18,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -36,7 +36,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteReplacement {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->db->write("delete from replacements where replacementId=".$session->db->quote($session->form->process("replacementId")));
 	return www_listReplacements();
@@ -44,7 +44,7 @@ sub www_deleteReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacement {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $data = $session->db->getRow("replacements","replacementId",$session->form->process("replacementId"));
 	my $i18n = WebGUI::International->new($session);
@@ -79,7 +79,7 @@ sub www_editReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacementSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->db->setRow("replacements","replacementId",{
 		replacementId=>$session->form->process("replacementId"),
@@ -91,7 +91,7 @@ sub www_editReplacementSave {
 
 #-------------------------------------------------------------------
 sub www_listReplacements {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
 	my $output = '<table>';
diff --git a/lib/WebGUI/Operation/Scratch.pm b/lib/WebGUI/Operation/Scratch.pm
index c3dfc77b7..7e77076b0 100644
--- a/lib/WebGUI/Operation/Scratch.pm
+++ b/lib/WebGUI/Operation/Scratch.pm
@@ -32,7 +32,7 @@ variable, scratchName.
 =cut
 
 sub www_deleteScratch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->delete("www_".$session->form->process("scratchName"));
 	return "";
 }
@@ -49,7 +49,7 @@ the value the variable should take.
 =cut
 
 sub www_setScratch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->set("www_".$session->form->process("scratchName"),$session->form->process("scratchValue"));
 	return "";
 }
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index ac7d7aed3..79d0c7e94 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -19,7 +19,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_editSettings {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session, "WebGUI");
 	my %tabs;
@@ -288,7 +288,7 @@ sub www_editSettings {
 
 #-------------------------------------------------------------------
 sub www_saveSettings {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($key, $value);
 	foreach $key ($session->request->params) {
diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm
index 35f694bbb..af817764f 100644
--- a/lib/WebGUI/Operation/Shared.pm
+++ b/lib/WebGUI/Operation/Shared.pm
@@ -18,7 +18,7 @@ use Safe;
 
 #-------------------------------------------------------------------
  sub accountOptions {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session);
 	my @array;
 	if ($session->user->isInGroup(12)) {
@@ -69,7 +69,7 @@ use Safe;
 #-------------------------------------------------------------------
 # This function is here to replace the dangerous eval calls in the User Profile System.
 sub secureEval {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $code = shift;
 
 	# Handle WebGUI function calls
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 7cbd59f76..f3cb788de 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -18,7 +18,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -33,7 +33,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_viewStatistics {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $data);
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/Style.pm b/lib/WebGUI/Operation/Style.pm
index b77a0f737..a1e4086bc 100644
--- a/lib/WebGUI/Operation/Style.pm
+++ b/lib/WebGUI/Operation/Style.pm
@@ -33,7 +33,7 @@ the printableStyleId is used instead of the normal styleId for the page.
 =cut
 
 sub www_makePrintable {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	if ($session->form->process("styleId") ne "") {
 		$session->asset->{_properties}{printableStyleTemplateId} = $session->form->process("styleId");
 	}
@@ -52,7 +52,7 @@ overriding the style without setting a printable style and on a per user basis.
 =cut
 
 sub www_setPersonalStyle {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->set("personalStyleId",$session->form->process("styleId"));
 	return "";
 }
@@ -66,7 +66,7 @@ Clears the personalStyleId from the scratch area of the session variable.
 =cut
 
 sub www_unsetPersonalStyle {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->scratch->delete("personalStyleId");
 	return "";
 }
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index 9f305a76c..2a64f6bd5 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -14,7 +14,7 @@ use WebGUI::International;
 
 #-------------------------------------------------------------------
 sub _generateCode {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($codeLength, @codeElements, $code, $i);
 	$codeLength = shift || 64;
 	@codeElements = ('A'..'Z', 'a'..'z', 0..9, '-');
@@ -28,7 +28,7 @@ sub _generateCode {
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $i18n = WebGUI::International->new($session, "Subscription");
 
 	my $workarea = shift;
@@ -49,7 +49,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (%subscriptions, $f, $error, $errorMessage);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -107,7 +107,7 @@ sub www_createSubscriptionCodeBatch {
 	
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatchSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($numberOfCodes, $description, $expires, $batchId, @codeElements, $currentCode, $code, $i, @subscriptions, 
 		@error, $creationEpoch);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
@@ -148,7 +148,7 @@ sub www_createSubscriptionCodeBatchSave {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscription {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	WebGUI::Subscription->new($session,$session->form->process("sid"))->delete;
@@ -157,7 +157,7 @@ sub www_deleteSubscription {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodeBatch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	$session->db->write("delete from subscriptionCodeBatch where batchId=".$session->db->quote($session->form->process("bid")));
@@ -168,7 +168,7 @@ sub www_deleteSubscriptionCodeBatch {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodes {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	if ($session->form->process("selection") eq 'dc') {
@@ -184,7 +184,7 @@ sub www_deleteSubscriptionCodes {
 
 #-------------------------------------------------------------------
 sub www_editSubscription {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($properties, $subscriptionId, $durationInterval, $durationUnits, $f);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -261,7 +261,7 @@ sub www_editSubscription {
 
 #-------------------------------------------------------------------
 sub www_editSubscriptionSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (@relevantFields);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -272,7 +272,7 @@ sub www_editSubscriptionSave {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodeBatches {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($p, $batches, $output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -302,7 +302,7 @@ sub www_listSubscriptionCodeBatches {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodes {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($p, $codes, $output, $where, $ops, $delete);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 
@@ -384,7 +384,7 @@ sub www_listSubscriptionCodes {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptions {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($p, $subscriptions, $output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -413,7 +413,7 @@ sub www_listSubscriptions {
 
 #-------------------------------------------------------------------
 sub www_purchaseSubscription {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	WebGUI::Commerce::ShoppingCart->new($session)->add($session->form->process("sid"), 'Subscription');
 	
 	return $session->http->setRedirect($session->url->page('op=checkout'));
@@ -421,7 +421,7 @@ sub www_purchaseSubscription {
 
 #-------------------------------------------------------------------
 sub www_redeemSubscriptionCode {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (%codeProperties, @subscriptions, %var, $f);
 	my $i18n = WebGUI::International->new($session, "Subscription");
 	
diff --git a/lib/WebGUI/Operation/TransactionLog.pm b/lib/WebGUI/Operation/TransactionLog.pm
index eef70bd4a..f9818dd69 100644
--- a/lib/WebGUI/Operation/TransactionLog.pm
+++ b/lib/WebGUI/Operation/TransactionLog.pm
@@ -29,7 +29,7 @@ This error message will be added to the template variables.
 =cut
 
 sub www_viewPurchaseHistory {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my (@history, @historyLoop, %var, %properties);
 
 	$var{errorMessage} = shift;
@@ -63,7 +63,7 @@ $session->form->process("tid").
 =cut
 
 sub www_cancelRecurringTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my ($transaction, $error, $message);
 	
 	my $i18n = WebGUI::International->new($session, "TransactionLog");
@@ -89,7 +89,7 @@ Afterward, it calls www_listTransactions
 =cut
 
 sub www_deleteTransaction {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $transactionId;
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
@@ -103,7 +103,7 @@ sub www_deleteTransaction {
 
 #-------------------------------------------------------------------
 sub www_deleteTransactionItem {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	
 	WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->deleteItem($session->form->process("iid"), $session->form->process("itype"));
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 4c2f91ff5..2f9884c52 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -56,7 +56,7 @@ Help topic.  If set, then a Help icon will be displayed as a link to that topic.
 =cut
 
 sub _submenu {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -105,7 +105,7 @@ Array reference, used to screen out user names via a SQL "not in ()" clause.
 
 #-------------------------------------------------------------------
 sub doUserSearch {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $op = shift;
 	my $returnPaginator = shift;
 	my $userFilter = shift;
@@ -157,7 +157,7 @@ Hashref.  A set of key,value pairs that will be hidden in the user search form.
 
 #-------------------------------------------------------------------
 sub getUserSearchForm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $op = shift;
 	my $params = shift;
 	$session->scratch->set("userSearchKeyword",$session->form->process("keyword"));
@@ -220,7 +220,7 @@ Allows an administrator to assume another user.
 =cut
 
 sub www_becomeUser {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->user({userId=>$session->form->process("uid")});
 	return "";
@@ -238,7 +238,7 @@ of the user to delete is expected in a URL param names 'uid'.
 =cut
 
 sub www_deleteUser {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my ($output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
@@ -265,7 +265,7 @@ after this.
 =cut
 
 sub www_deleteUserConfirm {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($u);
         if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
@@ -279,7 +279,7 @@ sub www_deleteUserConfirm {
 
 #-------------------------------------------------------------------
 sub www_editUser {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(11));
 	my $error = shift;
 	my $i18n = WebGUI::International->new($session, "WebGUI");
@@ -387,7 +387,7 @@ sub www_editUser {
 
 #-------------------------------------------------------------------
 sub www_editUserSave {
-	my $session = shift;	
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);	
 	my $isAdmin = $session->user->isInGroup(3);
 	my $isSecondary;
 	unless ($isAdmin) {
@@ -427,7 +427,7 @@ sub www_editUserSave {
 
 #-------------------------------------------------------------------
 sub www_editUserKarma {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
 	my $i18n = WebGUI::International->new($session);
@@ -457,7 +457,7 @@ sub www_editUserKarma {
 
 #-------------------------------------------------------------------
 sub www_editUserKarmaSave {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($u);
         $u = WebGUI::User->new($session->form->process("uid"));
@@ -467,7 +467,7 @@ sub www_editUserKarmaSave {
 
 #-------------------------------------------------------------------
 sub www_listUsers {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	unless ($session->user->isInGroup(3)) {
 		if ($session->user->isInGroup(11)) {
 			$session->form->process("uid") = "new";
diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm
index 5ce52d676..3abf82f39 100644
--- a/lib/WebGUI/Operation/WebGUI.pm
+++ b/lib/WebGUI/Operation/WebGUI.pm
@@ -24,7 +24,7 @@ The beginning of WebGUI.
 =cut
 
 sub www_genesis {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->useEmptyStyle("1");
 	my $output = '<html><head><title>About WebGUI</title>
 	<style>.big {font-size: 23px;}</style>
@@ -51,7 +51,7 @@ password and email address, as well as some other WebGUI settings.
 
 #-------------------------------------------------------------------
 sub www_setup {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->http->setMimeType("text/html");
 	return "" unless ($session->setting->get("specialState") eq "init");
 	my $i18n = WebGUI::International->new($session, "WebGUI");
@@ -68,7 +68,7 @@ sub www_setup {
 	<body><div style="font-family: georgia, helvetica, arial, sans-serif; color: white; z-index: 10; width: 550px; height: 400px; top: 20%; left: 20%; position: absolute;"><h1>WebGUI Initial Configuration</h1><fieldset>';
 	if ($session->form->process("step") eq "2") {
 		$output .= '<legend align="left">Company Information</legend>';
-		my $u = WebGUI::User->new("3");
+		my $u = WebGUI::User->new($session,"3");
 		$u->username($session->form->process("username","text","Admin"));
 		$u->profileField("email",$session->form->email("email"));
 		$u->identifier(Digest::MD5::md5_base64($session->form->process("identifier","password","123qwe")));
@@ -160,7 +160,7 @@ to work, even superseding the session variable.
 
 #-------------------------------------------------------------------
 sub www_theWg {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$session->style->useEmptyStyle("1");
 	my $output = '<html><head><title>WebGUI</title></head><body BGCOLOR="black"><center>
 <nobr><font SIZE="1" FACE="Courier New, Courier"><font COLOR="white"></font><font COLOR="#1A1108">p</font><font COLOR="#24130C">a</font><font COLOR="#5C2605">c</font><font COLOR="#642206">kageW</font><font COLOR="#5C1F04">e</font><font COLOR="#642206">bGUI;ou</font><font COLOR="#5C2605">r</font><font COLOR="#642206">$VERSION="5.5.0</font><font COLOR="#5C2605">"</font><font COLOR="#642206">;usestr</font><font COLOR="#5C1F04">i</font><font COLOR="#642206">ctqw(v</font><font COLOR="#68290C">a</font><font COLOR="#5C1F04">r</font><font COLOR="#5C2605">s</font><font COLOR="#642206">s</font><font COLOR="#541604">u</font><font COLOR="#481404">b</font><font COLOR="#380B04">s</font><font COLOR="#0B0204">);useTie::CPHash;useW
diff --git a/lib/WebGUI/Paginator.pm b/lib/WebGUI/Paginator.pm
index cdc0a5183..c9b7df8b7 100644
--- a/lib/WebGUI/Paginator.pm
+++ b/lib/WebGUI/Paginator.pm
@@ -457,7 +457,7 @@ Specify the form variable the paginator should use in it's links.  Defaults to "
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $currentURL = shift;
 	my $rowsPerPage = shift || 25;
 	my $formVar = shift || "pn";
diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm
index 1723076fa..686e8143e 100644
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@@ -54,7 +54,7 @@ The assetId to add.
 =cut
 
 sub add {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return unless ($session->setting->get("passiveProfilingEnabled"));
 	my $assetId = shift;
 	my $sql = "insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry)
@@ -84,7 +84,7 @@ The assetId of the page you want to log.
 =cut
 
 sub addPage {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	return unless ($session->setting->get("passiveProfilingEnabled"));
 	my $pageId = shift;
 	my @wids = $session->db->buildArray("select assetId from asset where parentId=".$session->db->quote($pageId));
@@ -112,7 +112,7 @@ A hashRef with userId and assetId.
 =cut
 
 sub summarizeAOI {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $data = shift;
 	my $sql = "
 		select f.fieldName, 
diff --git a/lib/WebGUI/Product.pm b/lib/WebGUI/Product.pm
index 830119e4f..32adb41c6 100755
--- a/lib/WebGUI/Product.pm
+++ b/lib/WebGUI/Product.pm
@@ -129,7 +129,7 @@ sub getByOptionId {
 	my ($class, $optionId, $productId);
 
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$optionId = shift;
 	
 
@@ -145,7 +145,7 @@ sub getByOptionId {
 sub getByParameterId {
 	my ($class, $parameterId, $productId);
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$parameterId = shift;
 	
 	($productId) = $session->db->quickArray("select productId from productParameters where parameterId=".$session->db->quote($parameterId));
@@ -157,7 +157,7 @@ sub getByParameterId {
 sub getByVariantId {
 	my ($class, $productId, $variantId);
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$variantId = shift;
 
 	($productId) = $session->db->quickArray("select productId from productVariants where variantId=".$session->db->quote($variantId));
@@ -202,7 +202,7 @@ sub getVariant {
 sub new {
 	my ($class, $productId, $properties, $parameters, $variants, $options, $sth, %row, $option, $new);
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$productId = shift;
 	$session->errorHandler->fatal('no productId') unless ($productId);
 	$parameters = {};
diff --git a/lib/WebGUI/ProfileCategory.pm b/lib/WebGUI/ProfileCategory.pm
index 541b3bc41..419923a50 100644
--- a/lib/WebGUI/ProfileCategory.pm
+++ b/lib/WebGUI/ProfileCategory.pm
@@ -69,7 +69,7 @@ A hash reference containing the properties of this field. See the set() method f
 
 sub create {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $properties = shift;
         my ($sequenceNumber) = $session->db->quickArray("select max(sequenceNumber) from userProfileCategory");
  	my $id = $session->db->setRow("userProfileCategory","profileCategoryId",{profileCategoryId=>"new", sequenceNumber=>$sequenceNumber+1});
@@ -275,7 +275,7 @@ The unique id of this category.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = shift;
 	return undef unless ($id);
 	my $properties = $session->db->getRow("userProfileCategory","profileCategoryId",$id);
diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm
index 25d6210dd..50fa633d7 100644
--- a/lib/WebGUI/ProfileField.pm
+++ b/lib/WebGUI/ProfileField.pm
@@ -80,7 +80,7 @@ The unique id of the category to assign this field to. Defaults to "1" (misc).
 
 sub create {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $fieldName = shift;
         my $properties = shift;
 	my $categoryId = shift || "1";
@@ -154,11 +154,11 @@ sub formField {
 	}
 	$properties->{value} = $default;
 	if ($withWrapper == 1) {
-		return WebGUI::Form::DynamicField->new(%{$properties})->displayFormWithWrapper;
+		return WebGUI::Form::DynamicField->new($self->session,%{$properties})->displayFormWithWrapper;
 	} elsif ($withWrapper == 2) {
-		return WebGUI::Form::DynamicField->new(%{$properties})->displayValue;
+		return WebGUI::Form::DynamicField->new($self->session,%{$properties})->displayValue;
 	} else {
-		return WebGUI::Form::DynamicField->new(%{$properties})->displayForm;
+		return WebGUI::Form::DynamicField->new($self->session,%{$properties})->displayForm;
 	}
 }
 
@@ -412,7 +412,7 @@ The unique name of this field.
 
 sub new {
         my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $id = shift;
         return undef unless ($id);
         my $properties = $session->db->getRow("userProfileField","fieldName",$id);
diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm
index d7cba5e92..8dc67c05d 100644
--- a/lib/WebGUI/SQL.pm
+++ b/lib/WebGUI/SQL.pm
@@ -217,7 +217,7 @@ The password to use to connect to the database defined by dsn.
 
 sub connect {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $dsn = shift;
 	my $user = shift;
 	my $pass = shift;
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 5d94a1855..cde9186ac 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -360,7 +360,6 @@ sub open {
 	my $self = {_config=>$config, _server=>$server};
 	bless $self , $class;
 	$self->{_var} = WebGUI::Session::Var->new($self,$sessionId);
-	warn "request = ".$request;
 	$self->{_request} = Apache2::Request->new($request, POST_MAX => 1024 * $self->setting->get("maxAttachmentSize")) if (defined $request);
 	return $self;
 }
diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm
index e984800f0..613d47656 100644
--- a/lib/WebGUI/Session/DateTime.pm
+++ b/lib/WebGUI/Session/DateTime.pm
@@ -625,7 +625,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index 98de58317..06dc14089 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -315,7 +315,7 @@ An active WebGUI::Session object.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	unless (Log::Log4perl->initialized()) {
 		$Log::Log4perl::caller_depth++;
  		Log::Log4perl->init( $session->config->getWebguiRoot."/etc/log.conf" );   
diff --git a/lib/WebGUI/Session/Form.pm b/lib/WebGUI/Session/Form.pm
index eb6d04b8f..d87879a11 100644
--- a/lib/WebGUI/Session/Form.pm
+++ b/lib/WebGUI/Session/Form.pm
@@ -98,7 +98,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
@@ -149,7 +149,7 @@ sub process {
 	my $value;
 	$type = ucfirst($type);
 	$type = "Text" if ($type eq "");
-	$value = $self->$type($self->session,$name);
+	$value = $self->$type($name);
 	unless (defined $value) {
 		return $default;
 	}
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 3db4d76dc..23186e173 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -172,7 +172,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm
index 83faae8b7..ac9a449db 100644
--- a/lib/WebGUI/Session/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -501,7 +501,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Id.pm b/lib/WebGUI/Session/Id.pm
index 20512176a..5b78bbea8 100644
--- a/lib/WebGUI/Session/Id.pm
+++ b/lib/WebGUI/Session/Id.pm
@@ -89,7 +89,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	srand;
 	bless {_session=>$session}, $class;
 }
diff --git a/lib/WebGUI/Session/Privilege.pm b/lib/WebGUI/Session/Privilege.pm
index e8122edf3..c7b36d4cc 100644
--- a/lib/WebGUI/Session/Privilege.pm
+++ b/lib/WebGUI/Session/Privilege.pm
@@ -113,7 +113,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Scratch.pm b/lib/WebGUI/Session/Scratch.pm
index 9feca8352..cde9fa9a4 100644
--- a/lib/WebGUI/Session/Scratch.pm
+++ b/lib/WebGUI/Session/Scratch.pm
@@ -148,7 +148,7 @@ The current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $data = $session->db->buildHashRef("select name,value from userSessionScratch where sessionId=".$session->db->quote($session->getId));
 	bless {_session=>$session,_sessionId=>$session->getId, _data=>$data}, $class;
 }
diff --git a/lib/WebGUI/Session/Setting.pm b/lib/WebGUI/Session/Setting.pm
index 8fa5526c6..9b7e17783 100644
--- a/lib/WebGUI/Session/Setting.pm
+++ b/lib/WebGUI/Session/Setting.pm
@@ -114,7 +114,7 @@ A reference to the current WebGUI::Session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $settings = $session->db->buildHashRef("select * from settings");
 	bless {_settings=>$settings, _session=>$session}, $class;
 }
diff --git a/lib/WebGUI/Session/Stow.pm b/lib/WebGUI/Session/Stow.pm
index e6b52eef1..9eca8b7a0 100644
--- a/lib/WebGUI/Session/Stow.pm
+++ b/lib/WebGUI/Session/Stow.pm
@@ -125,7 +125,7 @@ A reference to the session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index b1a519a88..8ad77bf3d 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -144,7 +144,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Url.pm b/lib/WebGUI/Session/Url.pm
index 9fa128535..86e778db9 100644
--- a/lib/WebGUI/Session/Url.pm
+++ b/lib/WebGUI/Session/Url.pm
@@ -259,7 +259,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Var.pm b/lib/WebGUI/Session/Var.pm
index 08df8a1c6..1afc315f7 100644
--- a/lib/WebGUI/Session/Var.pm
+++ b/lib/WebGUI/Session/Var.pm
@@ -159,7 +159,7 @@ A reference to the session.
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $self = bless {_session=>$session}, $class;
 	my $sessionId = shift || $session->http->getCookies->{"wgSession"};
         if ($sessionId eq "") {
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index 3ec1546f1..a899cc21e 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -326,7 +326,7 @@ A reference to the current session;
 
 sub create {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = $session->id->generate();
 	my $self = $class->get($session,$id); 
 	$self->_makePath;
@@ -348,7 +348,7 @@ A reference to the current session.
 
 sub createTemp {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = $session->id->generate();
 	$id =~ m/^(.{2})/;
 	my $self = {_session=>$session, _id => $id, _part1 => 'temp', _part2 => $1};
@@ -409,7 +409,7 @@ The unique identifier for this file system storage location.
 
 sub get {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $id = shift;
 	return undef unless $id;
 	$id =~ m/^(.{2})(.{2})/;
diff --git a/lib/WebGUI/Subscription.pm b/lib/WebGUI/Subscription.pm
index fea22b196..96f82d9d2 100644
--- a/lib/WebGUI/Subscription.pm
+++ b/lib/WebGUI/Subscription.pm
@@ -61,7 +61,7 @@ sub apply {
 	$group->addUsers([$userId], $self->_getDuration($self->{_properties}{duration}));
 
 	# Add karma
-	WebGUI::User->new($userId)->karma($self->{_properties}{karma}, 'Subscription', 'Added for purchasing subscription '.$self->{_properties}{name});
+	WebGUI::User->new($self->session,$userId)->karma($self->{_properties}{karma}, 'Subscription', 'Added for purchasing subscription '.$self->{_properties}{name});
 
 	# Process executeOnPurchase field
 	my $command = $self->{_properties}{executeOnSubscription};
@@ -127,7 +127,7 @@ from the database.
 sub new {
 	my ($class, $subscriptionId, %properties);
 	$class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	$subscriptionId = shift;
 
 	if ($subscriptionId eq 'new') {
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index 20c8c9496..80027f185 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -192,7 +192,7 @@ A string containing the link to the tab-CascadingStyleSheet
 
 sub new {
 	my $class = shift;
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $startingTabs = shift;
 	my $css = shift || $session->config->get("extrasURL").'/tabs/tabs.css';
 	my $cancelUrl = shift || $session->url->page();
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index f89deff0c..3abe6a6ba 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -30,7 +30,7 @@ This package provides an object-oriented way of managing WebGUI users as well as
 =head1 SYNOPSIS
 
  use WebGUI::User;
- $u = WebGUI::User->new(3); or  $f = WebGUI::User->new("new");
+ $u = WebGUI::User->new($session,3); or  $f = WebGUI::User->new($session,"new");
 
  $authMethod =		$u->authMethod("WebGUI");
  $dateCreated = 	$u->dateCreated;
@@ -54,7 +54,7 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 sub _create {
-	my $session = shift;
+	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
 	my $userId = shift || $session->id->generate();
 	$session->db->write("insert into users (userId,dateCreated) values (".$session->db->quote($userId).",".time().")");
 	WebGUI::Group->new($session,[2])->addUsers([$userId]);
@@ -464,7 +464,7 @@ A unique ID to use instead of the ID that WebGUI will generate for you. It must
 
 sub new {
         my $class = shift;
-        my $session = shift;
+        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
         my $userId = shift || 1;
 	my $overrideId = shift;
         $userId = _create($session, $overrideId) if ($userId eq "new");
diff --git a/sbin/preload.perl b/sbin/preload.perl
index ebbdb0320..82d7beddc 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -53,6 +53,9 @@ foreach my $package (@modules) {
 	eval($use);
 }
 
+use Apache2::ServerUtil ();
+Apache2::ServerUtil->server->add_version_component("WebGUI/".$WebGUI::VERSION);
+
 
 #----------------------------------------
 # Preload all site configs.