diff --git a/sbin/imageCollateralImport.pl b/sbin/imageCollateralImport.pl
index 13b7d29a3..4afa1e9d9 100644
--- a/sbin/imageCollateralImport.pl
+++ b/sbin/imageCollateralImport.pl
@@ -23,30 +23,24 @@ BEGIN {
 
 $| = 1;
 
-use File::stat;
-use Image::Magick;
-use DBI;
-use Mysql;
-use Data::Config;
-use WebGUI::SQL;
-use File::Copy qw(cp);
-use File::Path;
-use FileHandle;
-use POSIX;
+#use File::stat;
+#use File::Path;
+#use POSIX;
 use strict;
-
-my ($config, $filelist, $dbh, $settings);
+use WebGUI::Attachment;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::Utility;
 
 if ($ARGV[0] ne "" && $ARGV[1] ne ""){
   	print "Starting...\n";
-  	$filelist = buildFileList($ARGV[0]);
-	$config = getConfig($ARGV[1]);
-  	$dbh = connectToDb($config);
-  	$settings = getSettings($dbh,$ARGV[2]);
-  	addFiles($dbh, $filelist, $settings, $ARGV[0], $config);
-  	setPrivileges($config) unless ($^O =~ /Win/i);
+  	print "Establishing WebGUI Session...\n";
+	WebGUI::Session::open($webguiRoot,$ARGV[1]);
+        WebGUI::Session::refreshUserInfo(3);
+  	addFiles(buildFileList($ARGV[0]), $ARGV[0],($ARGV[2]||$session{setting}{thumbnailSize}));
+  	setPrivileges() unless ($session{os}{type} eq "Windowsish");
   	print "Cleaning up...\n";
-  	$dbh->disconnect;
+	WebGUI::Session::close();
   	print "Finished!\n";
 } else {
   	print "Usage: $0 <pathToNewImages> <webguiConfigFile> [<thumbnailSize>]\n";
@@ -57,90 +51,34 @@ if ($ARGV[0] ne "" && $ARGV[1] ne ""){
 #-----------------------------------------
 sub addFiles {
   	my ($filename, $ext, $id, $a, $b);
+	my ($filelist, $pathToImages, $thumbnailSize) = @_;
   	print "Adding files...\n";
-	mkdir($_[4]->{uploadsPath}."/images");
-      	foreach $filename (keys %{$_[1]}) {
+      	foreach $filename (keys %{$filelist}) {
        		print "Processing $filename.\n";
-       		foreach $ext (keys %{${$_[1]}{$filename}}) {
-       			$id = getId($_[0]);
-       			print "Copying ".${$_[1]}{$filename}{$ext}.".\n";
-  			mkdir($_[4]->{uploadsPath}."/images/".$id);
-			$a = FileHandle->new($_[3]."/".${$_[1]}{$filename}{$ext},"r");
-          		binmode($a);
-          		$b = FileHandle->new(">".$_[4]->{uploadsPath}."/images/".$id."/".${$_[1]}{$filename}{$ext});
-	       		binmode($b);
-        		cp($a,$b);
-          		$a->close;
-          		$b->close;
-          		createThumbnail(${$_[1]}{$filename}{$ext},
-	       			$_[4]->{uploadsPath}."/images/".$id,
-        			$_[2]->{thumbnailSize});
+       		foreach $ext (keys %{${$filelist}{$filename}}) {
+       			$id = getNextId("collateralId");
+       			print "Copying ".${$filelist}{$filename}{$ext}.".\n";
+			my $file = WebGUI::Attachment->new(${$filelist}{$filename}{$ext},"images",$id);
+			$file->saveFromFilesystem($pathToImages."/".${$filelist}{$filename}{$ext},$thumbnailSize);
        			print "Adding $filename to the database.\n";
 			WebGUI::SQL->write("insert into collateral (collateralId,name,filename,userId,username,
 				dateUploaded,collateralType,thumbnailsize) values
-				($id,".$dbh->quote($filename).",".$dbh->quote($filename.".".$ext).",3,'Imported',".time()."
-				'image',$_[2]->{thumbnailSize})",$_[0]);
+				($id,".quote($filename).",".quote($filename.".".$ext).",3,'Imported',".time().",
+				'image',$thumbnailSize)");
 	       	}
 	}
   	print "Finished adding.\n";
 }
 
-#-----------------------------------------
-# getConfig(configFilename)
-#-----------------------------------------
-sub getConfig {
-        my ($config, $error, %config);
-        print "Getting site config.\n";
-        $config = new Data::Config $webguiRoot.'/etc/'.$_[0] or $error=1;
-        if ($error) {
-                print "Couldn't open config file.\n";
-                exit;
-        } else {
-                foreach ($config->param) {
-                        $config{$_} = $config->param($_);
-                }
-                print "Config retrieved.\n";
-                return \%config;
-        }
-}
-
 #-----------------------------------------
 # setPrivileges(webguiSettingsHashRef)
 #-----------------------------------------
 sub setPrivileges {
   	print "Setting filesystem privileges.\n";
-  	system("chown -R ".$webUser." ".$_[0]->{uploadsPath});
+  	system("chown -R ".$webUser." ".$session{config}{uploadsPath});
   	print "Privileges set.\n";
 }
 
-#-----------------------------------------
-# getSettings(dbHandler)
-#-----------------------------------------
-sub getSettings {
-  	my (%settings);
-  	print "Retrieving settings from WebGUI.\n";
-  	%settings = WebGUI::SQL->buildHash("select * from settings",$_[0]);
- 	print "Settings retrieved.\n";
-	$settings{thumbnailSize} = $_[1] if ($_[1] ne "");
-    	return \%settings;
-}
-
-#-----------------------------------------
-# connectToDb()
-#-----------------------------------------
-sub connectToDb {
-  	my ($config, $dbh, $error);
-  	print "Connecting to database ".$_[0]->{dsn}." as user ".$_[0]->{dbuser}.".\n";
-  	$dbh = DBI->connect($_[0]->{dsn}, $_[0]->{dbuser}, $_[0]->{dbpass}, { RaiseError => 0, AutoCommit => 1 }) or $error=1;
-  	unless ($error) {
-    		print "Connection established.\n";
-    		return $dbh;
-  	} else {
-    		print "Error: Could not connect to the database.\n";
-    		exit;
-  	}
-}
-
 #-----------------------------------------
 # buildFileList(pathToImportFiles)
 #-----------------------------------------
@@ -169,67 +107,5 @@ sub buildFileList {
   	}
 }
 
-#-----------------------------------------
-# isIn(keyvalue, arrayOfValues)
-#-----------------------------------------
-sub isIn {
-  	my ($i, @a, @b, @isect, %union, %isect, $e);
-  	foreach $e (@_) {
-    		if ($a[0] eq "") {
-     	 		$a[0] = $e;
-    		} else {
-      			$b[$i] = $e;
-      			$i++;
-    		}
-  	}
-  	foreach $e (@a, @b) { $union{$e}++ && $isect{$e}++ }
-  	@isect = keys %isect;
-  	if (defined @isect) {
-    		undef @isect;
-    		return 1;
-  	} else {
-    		return 0;
-  	}
-}
-
-#-----------------------------------------
-# getType(filename)
-#-----------------------------------------
-sub getType {
-  	my ($extension);
-  	$extension = $_[0];
-  	$extension =~ s/.*\.(.*?)$/$1/;
-  	return $extension;
-}
-
-#-----------------------------------------
-# createThumbnail(filename,path,thumnailSize)
-#-----------------------------------------
-sub createThumbnail {
-  	my ($image, $x, $y, $r, $n, $type);
-  	$type = getType($_[0]);
-  	if (isIn($type, @nailable) && !($_[0] =~ m/thumb-/)) {
-    		print "Nailing: $_[1]/$_[0]\n";
-    		$image = Image::Magick->new;
-    		$image->Read($_[1].'/'.$_[0]);
-    		($x, $y) = $image->Get('width','height');
-    		$n = $_[2] || 50;
-    		$r = $x>$y ? $x / $n : $y / $n;
-    		$image->Scale(width=>($x/$r),height=>($y/$r)) if ($r > 0);
-      		$image->Write($_[1].'/thumb-'.$_[0]);
-  	}
-}
-
-#-----------------------------------------
-# getId(dbHandler)
-#-----------------------------------------
-sub getId {
-  	my ($id);
-  	($id) = WebGUI::SQL->quickArray("select nextValue from incrementer where incrementerId='imageId'",$_[0]);
-  	WebGUI::SQL->write("update incrementer set nextValue=nextValue+1 where incrementerId='imageId'",$_[0]);
-  	return $id;
-}
-
-