diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl
index 70483c8dd..dbef2d02c 100644
--- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl
@@ -73,6 +73,9 @@ sub addWorkflow {
 	my $group = WebGUI::Group->new($session,"new","pbgroup000000000000015");
 	$group->set("groupName", "Workflow Managers");
 	$group->set("description", "People who can create, edit, and delete workflows.");
+	$group = WebGUI::Group->new($session,"new","pbgroup000000000000016");
+	$group->set("groupName", "Version Tag Managers");
+	$group->set("description", "People who can create, edit, and delete special version tags.");
 	$session->config->set("spectreIp","127.0.0.1");
 	$session->config->set("spectrePort",32133);
 	$session->config->set("spectreSubnets",["127.0.0.1/32"]);
@@ -224,6 +227,9 @@ sub addWorkflow {
                 }, "pbcron0000000000000003");
 	$session->db->write("alter table assetVersionTag add column isLocked int not null default 0");
 	$session->db->write("alter table assetVersionTag add column lockedBy varchar(22) binary not null");
+	$session->db->write("alter table assetVersionTag add column groupToUse varchar(22) binary not null");
+	$session->db->write("alter table assetVersionTag add column workflowId varchar(22) binary not null");
+	$session->db->write("update groups set showInForms=1 where groupId='12'");
 	$session->config->delete("SyncProfilesToLDAP_hour");
 	$session->config->delete("fileCacheSizeLimit");
 	$session->config->delete("passiveProfileInterval");
@@ -243,9 +249,11 @@ sub addWorkflow {
 		}, "pbworkflow000000000003");
 	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CommitVersionTag", "pbwfactivity0000000006");
 	$activity->set("title", "Commit Assets");
+	$session->setting->remove("autoCommit");
 	$session->setting->remove("alertOnNewUser");
 	$session->setting->remove("onNewUserAlertGroup");
 	$session->setting->set("runOnRegistration","");
+	$session->setting->add("defaultVersionTagWorkflow",$workflow->getId);
 }
 
 #-------------------------------------------------
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 4111b13a7..9db5b60e9 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -155,11 +155,11 @@ sub getAdminFunction {
 		"versions"=>{
 			title=>{
 				id=>"content versioning",
-				namespace=>"Asset"
+				namespace=>"VersionTag"
 			},
 			icon=>"versionTags.gif",
-			func=>"manageVersions",
-			group=>"3"
+			op=>"manageVersions",
+			group=>"12"
 		},
 		"workflow"=>{
 			title=>{
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index a12d4d2a0..46fadb518 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -32,6 +32,7 @@ use WebGUI::Search;
 use WebGUI::Search::Index;
 use WebGUI::TabForm;
 use WebGUI::Utility;
+use WebGUI::VersionTag;
 
 =head1 NAME
 
@@ -1176,12 +1177,10 @@ sub manageAssetsSearch {
          assetManager.AddColumn('".$i18n->get("size")."','','right','');
          \n";
         foreach my $child (@{$assets}) {
-		my $commit = 'contextMenu.addLink("'.$child->getUrl("func=commitRevision").'","'.$i18n->get("commit").'");' if ($child->canEditIfLocked);
 		$output .= 'var contextMenu = new contextMenu_createWithLink("'.$child->getId.'","More");
                 contextMenu.addLink("'.$child->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'");
                 contextMenu.addLink("'.$child->getUrl("func=createShortcut;proceed=manageAssets").'","'.$i18n->get("create shortcut").'");
 		contextMenu.addLink("'.$child->getUrl("func=manageRevisions").'","'.$i18n->get("revisions").'");
-		'.$commit.'
                 contextMenu.addLink("'.$child->getUrl.'","'.$i18n->get("view").'"); '."\n";
 		my $title = $child->getTitle;
 		$title =~ s/\'/\\\'/g;
@@ -1745,9 +1744,7 @@ sub www_editSave {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless $self->canEdit;
 	my $object;
-	unless($self->session->setting->get("autoCommit") || $self->session->scratch->get("versionTag")) {
-		$self->addVersionTag;
-	}
+	my $tag = WebGUI::VersionTag->getWorking($self->session);
 	if ($self->session->form->process("assetId") eq "new") {
 		$object = $self->addChild({className=>$self->session->form->process("class")});	
 		$object->{_parent} = $self;
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index b1fdd24ff..cf9406002 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -74,31 +74,6 @@ sub addRevision {
         return $newVersion;
 }
 
-#-------------------------------------------------------------------
-
-=head2 addVersionTag ( [ name ] ) 
-
-A class method. Creates a version tag and assigns the tag to the current user's version tag. Returns the id of the tag created.
-
-=head3 name
-
-The name of the version tag. If not specified, one will be generated using the current user's name along with the date.
-
-=cut
-
-sub addVersionTag {
-	my $self = shift;
-	my $name = shift || "Autotag created ".$self->session->datetime->epochToHuman()." by ".$self->session->user->username;
-	my $tagId = $self->session->db->setRow("assetVersionTag","tagId",{
-		tagId=>"new",
-		name=>$name,
-		creationDate=>$self->session->datetime->time(),
-		createdBy=>$self->session->user->userId
-		});
-	$self->session->scratch->set("versionTag",$tagId);
-	return $tagId;
-} 
-
 
 #-------------------------------------------------------------------
 
@@ -131,29 +106,6 @@ sub commit {
 	$self->indexContent;
 }
 
-#-------------------------------------------------------------------
-
-=head2 commitVersionTag ( tagId )
-
-Commits all assets edited under a version tag, and then sets the version tag to committed.
-
-=head3 tagId
-
-The unique id of the tag to be committed.
-
-=cut
-
-sub commitVersionTag {
-	my $self = shift;
-	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($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));
-	$self->session->db->write("delete from userSessionScratch where name='versionTag' and value=".$self->session->db->quote($tagId));
-}
 
 
 #-------------------------------------------------------------------
@@ -215,69 +167,6 @@ sub purgeRevision {
 }
 
 
-#-------------------------------------------------------------------
-
-=head2 rollbackSiteToTime ( time ) 
-
-A class method. Rollback the entire site to a specific point in time. Returns 1 if successful.
-
-=head3 time
-
-The epoch time to rollback to. Anything after this time will be permanently deleted.
-
-=cut
-
-sub rollbackToTime {
-	my $self = shift;
-	my $toTime = shift;
- 	unless ($toTime) {	
-		return 0;
-		$self->session->errorHandler->warn("You must specify a time when you call rollbackSiteToTime().");
-	}
-	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($self->session,$id, $class, $revisionDate);
-		$revision->purgeRevision;
-	}
-	$sth->finish;
-	return 1;
-}
-
-#-------------------------------------------------------------------
-
-=head2 rollbackVersionTag ( tagId )
-
-A class method. Eliminates all revisions of all assets created under a specific version tag. Also removes the version tag.
-
-=head3 tagId
-
-The unique identifier of the version tag to be purged.
-
-=cut
-
-sub rollbackVersionTag {
-	my $self = shift;
-	my $tagId = shift;
- 	unless ($tagId) {	
-		return 0;
-		$self->session->errorHandler->warn("You must specify a tag ID when you call rollbackVersionTag().");
-	}
-	if ($tagId eq "pbversion0000000000001" || $tagId eq "pbversion0000000000002") {
-		return 0;
-		$self->session->errorHandler->warn("You cannot rollback a tag that is required for the system to operate.");	
-	}
-	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($self->session,$id, $class, $revisionDate);
-		$revision->purgeRevision;
-	}
-	$sth->finish;
-	$self->session->db->write("delete from assetVersionTag where tagId=".$self->session->db->quote($tagId));
-	$self->session->db->write("delete from userSessionScratch where name='versionTag' and value=".$self->session->db->quote($tagId));
-	return 1;
-}
-
-
 #-------------------------------------------------------------------
 
 =head2 setVersionLock ( ) 
@@ -335,108 +224,6 @@ sub updateHistory {
 }
 
 
-#-------------------------------------------------------------------
-
-=head2 www_addVersionTag ()
-
-Displays the add version tag form.
-
-=cut
-
-sub www_addVersionTag {
-	my $self = shift;
-	my $ac = WebGUI::AdminConsole->new($self->session,"versions");
-        return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
-	my $i18n = WebGUI::International->new($self->session,"Asset");
-        $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
-	my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
-	my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId"));
-	$f->hidden(
-		-name=>"func",
-		-value=>"addVersionTagSave"
-		);
-	$f->text(
-		-name=>"name",
-		-label=>$i18n->get("version tag name"),
-		-hoverHelp=>$i18n->get("version tag name description"),
-		-value=>$tag->{name},
-		);
-	$f->submit;
-        return $ac->render($f->print,$i18n->get("add version tag"));	
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 www_addVersionTagSave ()
-
-Adds a version tag and sets the user's default version tag to that.
-
-=cut
-
-sub www_addVersionTagSave {
-	my $self = shift;
-        return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
-	$self->addVersionTag($self->session->form->process("name"));
-	return $self->www_manageVersions();
-}
-
-
-#-------------------------------------------------------------------
-
-sub www_commitRevision {
-	my $self = shift;
-	return $self->session->privilege->adminOnly() unless $self->canEdit;
-	$self->commit;
-	return $self->getContainer->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
-	return $self->getContainer->www_view;
-}
-#-------------------------------------------------------------------
-
-sub www_commitVersionTag {
-	my $self = shift;
-	return $self->session->privilege->adminOnly() unless $self->session->user->isInGroup(3);
-	my $tagId = $self->session->form->process("tagId");
-	if ($tagId) {
-		$self->commitVersionTag($tagId);
-	}
-	return $self->www_manageVersions;
-}
-
-#-------------------------------------------------------------------
-
-=head2 www_manageVersionTags ()
-
-Shows a list of the currently available asset version tags.
-
-=cut
-
-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($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"));
-        $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
-        my $output = '<table width=100% class="content">
-        <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($self->session,$by);
-                $output .= '<tr>
-			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
-			<td>'.$self->session->datetime->epochToHuman($date).'</td>
-			<td>'.$u->username.'</td>
-			<td><a href="'.$self->getUrl("proceed=manageCommittedVersions;func=rollbackVersionTag;tagId=".$id).'" onclick="return confirm(\''.$rollbackPrompt.'\');">'.$rollback.'</a></td></tr>';
-        }
-        $sth->finish;
-        $output .= '</table>';
-        return $ac->render($output,$i18n->get("committed versions"));
-}
-
-
 #-------------------------------------------------------------------
 
 =head2 www_manageRevisions ()
@@ -459,86 +246,12 @@ sub www_manageRevisions {
                 $output .= '<tr><td>'.$self->session->icon->delete("func=purgeRevision;revisionDate=".$date,$self->get("url"),$i18n->get("purge revision prompt")).'</td>
 			<td><a href="'.$self->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
 			<td>'.$by.'</td>
-			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$tagId).'">'.$tag.'</a></td>
+			<td><a href="'.$self->getUrl("op=manageRevisionsInTag;tagId=".$tagId).'">'.$tag.'</a></td>
 			</tr>';
         }
         $sth->finish;
         $output .= '</table>';
-        return $ac->render($output,$i18n->get("committed versions").": ".$self->getTitle);
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 www_manageVersionTags ()
-
-Shows a list of the currently available asset version tags.
-
-=cut
-
-sub www_manageVersions {
-	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($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"));
-	my ($tag) = $self->session->db->quickArray("select name from assetVersionTag where tagId=".$self->session->db->quote($self->session->scratch->get("versionTag")));
-	$tag ||= "None";
-	my $rollback = $i18n->get("rollback");
-	my $commit = $i18n->get("commit");
-	my $setTag = $i18n->get("set tag");
-	my $rollbackPrompt = $i18n->get("rollback version tag confirm");
-	my $commitPrompt = $i18n->get("commit version tag confirm");
-	my $output = '<p>You are currently working under a tag called: <b>'.$tag.'</b>.</p><table width=100% class="content">
-	<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($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>
-			<td>'.$self->session->datetime->epochToHuman($date).'</td>
-			<td>'.$u->username.'</td>
-			<td>
-			<a href="'.$self->getUrl("func=setVersionTag;tagId=".$id).'">'.$setTag.'</a> |
-			<a href="'.$self->getUrl("func=commitVersionTag;tagId=".$id).'" onclick="return confirm(\''.$commitPrompt.'\');">'.$commit.'</a></td></tr>';
-	}
-	$sth->finish;	
-	$output .= '</table>';
-	return $ac->render($output);
-}
-
-
-#-------------------------------------------------------------------
-
-sub www_manageRevisionsInTag {
-	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($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"));
-        my $output = '<table width=100% class="content">
-        <tr><th></th><th>Title</th><th>Type</th><th>Revision Date</th><th>Revised By</th></tr> ';
-	my $p = WebGUI::Paginator->new($self->session,$self->getUrl("func=manageRevisionsInTag;tagId=".$self->session->form->process("tagId")));
-	$p->setDataByQuery("select assetData.revisionDate, users.username, asset.assetId, asset.className from assetData 
-		left join asset on assetData.assetId=asset.assetId left join users on assetData.revisedBy=users.userId
-		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($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>
-			<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
-			<td>'.$by.'</td></tr>';
-        }
-        $output .= '</table>'.$p->getBarSimple;
-	my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId"));
-        return $ac->render($output,$i18n->get("revisions in tag").": ".$tag->{name});
+        return $ac->render($output,$i18n->get("committed versions", "VersionTag").": ".$self->getTitle);
 }
 
 
@@ -551,53 +264,13 @@ sub www_purgeRevision {
 	return undef unless $revisionDate;
 	WebGUI::Asset->new($self->session,$self->getId,$self->get("className"),$revisionDate)->purgeRevision;
 	if ($self->session->form->process("proceed") eq "manageRevisionsInTag") {
-		return $self->www_manageRevisionsInTag;
+		$self->session->http->setRedirect($self->getUrl("op=manageRevisionsInTag"));
+		return "";
 	}
 	return $self->www_manageRevisions;
 }
 
 
-#-------------------------------------------------------------------A
-
-sub www_rollbackVersionTag {
-	my $self = shift;
-	return $self->session->privilege->adminOnly() unless $self->session->user->isInGroup(3);
-	return $self->session->privilege->vitalComponent() if ($self->session->form->process("tagId") eq "pbversion0000000000001" || $self->session->form->process("tagId") eq "pbversion0000000000002");
-	my $tagId = $self->session->form->process("tagId");
-	if ($tagId) {
-		$self->rollbackVersionTag($tagId);
-	}
-	if ($self->session->form->process("proceed") eq "manageCommittedVersions") {
-		return $self->www_manageCommittedVersions;
-	}
-	return $self->www_manageVersions;
-}
-
-#-------------------------------------------------------------------A
-
-sub www_rollbackSiteToTime {
-	my $self = shift;
-	return $self->session->privilege->adminOnly() unless $self->session->user->isInGroup(3);
-
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 www_setVersionTag ()
-
-Sets the current user's working version tag.
-
-=cut
-
-sub www_setVersionTag () {
-	my $self = shift;
-	return $self->session->privilege->insufficient() unless $self->session->user->isInGroup(12);
-	$self->session->scratch->set("versionTag",$self->session->form->process("tagId"));
-	return $self->www_manageVersions();
-}
-
-
 #-------------------------------------------------------------------
 
 sub www_viewRevision {
diff --git a/lib/WebGUI/Form/Workflow.pm b/lib/WebGUI/Form/Workflow.pm
index 5c2f604e0..481e88686 100644
--- a/lib/WebGUI/Form/Workflow.pm
+++ b/lib/WebGUI/Form/Workflow.pm
@@ -101,7 +101,7 @@ Renders a template picker control.
 sub toHtml {
 	my $self = shift;
 	my $workflowList = WebGUI::Workflow->getList($self->session, $self->get("type"));
-	$workflowList->{""} = "None";
+	$workflowList->{""} = "None" if ($self->get("none"));
 	$self->set("options", $workflowList);
 	$self->setManageIcons();
 	return $self->SUPER::toHtml();
diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm
index dcbb3451f..223551bdb 100644
--- a/lib/WebGUI/Help/WebGUI.pm
+++ b/lib/WebGUI/Help/WebGUI.pm
@@ -290,11 +290,6 @@ our $HELP = {
                                 description => '406 description',
                                 namespace => 'WebGUI',
                         },
-                        {
-                                title => 'enable autocommit of asset versioning',
-                                description => 'enable autocommit of asset versioning description',
-                                namespace => 'Asset',
-                        },
                         {
                                 title => 'Enable Metadata',
                                 description => 'Enable Metadata description',
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 842330ce0..427cd4cb2 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -102,16 +102,16 @@ sub process {
 	if ($working) {
 		push(@tags, {
 			url=>$session->url->page("op=commitVersionTag;backToSite=1;tagId=".$working->getId),
-			label=>$i18n->get("commit my changes"),
-			icon=>$session->config->get("extrasURL").'/spacer.gif'
+			title=>$i18n->get("commit my changes"),
+			icon=>$session->config->get("extrasURL").'/adminConsole/small/versionTags.gif'
 			});
 	}
 	my $rs = $session->db->read("select tagId, name from assetVersionTag where isCommitted=0 and isLocked=0 order by name");
 	while (my ($id, $name) = $rs->array) {
 		push(@tags, {
-			url=>$session->url->page("op=setAsWorkingVersionTag;backToSite=1;tagId=".$id),
-			label=>$name,
-			icon=>($id eq $working->getId) ? $session->config->get("extrasURL").'/adminConsole/small/versionTags.gif' : $session->config->get("extrasURL").'/spacer.gif'
+			url=>$session->url->page("op=setWorkingVersionTag;backToSite=1;tagId=".$id),
+			title=>($id eq $working->getId) ?  '<span style="color: #000080;">* '.$name.'</span>' : $name,
+			icon=>$session->config->get("extrasURL").'/spacer.gif'
 			});
 	}
 	if (scalar(@tags)) {
diff --git a/lib/WebGUI/Operation.pm b/lib/WebGUI/Operation.pm
index bf32d65b5..fc5002cf7 100644
--- a/lib/WebGUI/Operation.pm
+++ b/lib/WebGUI/Operation.pm
@@ -77,6 +77,14 @@ Returns a hash reference containing operation and package names.
 
 sub getOperations {
 	return {
+	  'editVersionTag' => 'WebGUI::Operation::VersionTag',
+	  'editVersionTagSave' => 'WebGUI::Operation::VersionTag',
+	  'commitVersionTag' => 'WebGUI::Operation::VersionTag',
+	  'manageCommittedVersions' => 'WebGUI::Operation::VersionTag',
+	  'manageVersions' => 'WebGUI::Operation::VersionTag',
+	  'manageRevisionsInTag' => 'WebGUI::Operation::VersionTag',
+	  'rollbackVersionTag' => 'WebGUI::Operation::VersionTag',
+	  'setVersionTag' => 'WebGUI::Operation::VersionTag',
 	  'addWorkflow' => 'WebGUI::Operation::Workflow',
 	  'deleteWorkflow' => 'WebGUI::Operation::Workflow',
 	  'editWorkflowActivity' => 'WebGUI::Operation::Workflow',
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 1020206be..049b1cd1c 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -71,6 +71,13 @@ sub www_editSettings {
 		-value=>$session->setting->get("companyURL")
 		);
 # content settings
+	$tabform->getTab("content")->workflow(
+		name=>"defaultVersionTagWorkflow",
+		value=>$session->setting->get("defaultVersionTagWorkflow"),
+		type=>"WebGUI::VersionTag",
+		label=>$i18n->get("default version tag workflow"),
+		hoverHelp=>$i18n->get('default version tag workflow help')
+		);
         my %htmlFilter = (
 		'none'=>$i18n->get(420), 
 		'most'=>$i18n->get(421), 
@@ -113,12 +120,6 @@ sub www_editSettings {
 		-hoverHelp=>$i18n->get('406 description'),
 		-value=>$session->setting->get("thumbnailSize")
 		);
-	 $tabform->getTab("content")->yesNo(
-                -name=>"autoCommit",
-                -label=>$i18n->get("enable autocommit of asset versioning","Asset"),
-                -hoverHelp=>$i18n->get("enable autocommit of asset versioning description","Asset"),
-                -value=>$session->setting->get("autoCommit")
-        	);
 	 $tabform->getTab("content")->yesNo(
                 -name=>"metaDataEnabled",
                 -label=>$i18n->get("Enable Metadata"),
diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm
index 7e4e55609..431ea623c 100644
--- a/lib/WebGUI/Operation/VersionTag.pm
+++ b/lib/WebGUI/Operation/VersionTag.pm
@@ -18,6 +18,8 @@ use strict;
 use WebGUI::Paginator;
 use WebGUI::AdminConsole;
 use WebGUI::International;
+use WebGUI::VersionTag;
+use WebGUI::HTMLForm;
 
 =head1 NAME
 
@@ -40,60 +42,126 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 
-=head2 www_addVersionTag ()
+=head2 www_editVersionTag ( session, [ tagId ] )
 
-Displays the add version tag form.
+Displays the edit version tag form.
+
+=head3 session
+
+A reference to the current session.
+
+=head3 tagId
+
+An open tag id. This is optional as it normally grabs this value from a form post.
 
 =cut
 
-sub www_addVersionTag {
-	my $self = shift;
-	my $ac = WebGUI::AdminConsole->new($self->session,"versions");
-        return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
-	my $i18n = WebGUI::International->new($self->session,"Asset");
-        $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
-	my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
-	my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId"));
+sub www_editVersionTag {
+	my $session = shift;
+        return $session->privilege->insufficient() unless ($session->user->isInGroup(12));
+	my $tagId = shift || $session->form->param("tagId");
+	my $ac = WebGUI::AdminConsole->new($session,"versions");
+	my $i18n = WebGUI::International->new($session,"VersionTag");
+        $ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
+	my $f = WebGUI::HTMLForm->new($session);
+	my $tag = WebGUI::VersionTag->new($session, $tagId);
 	$f->hidden(
-		-name=>"func",
-		-value=>"addVersionTagSave"
+		-name=>"op",
+		-value=>"editVersionTagSave"
 		);
+	my $value = $tag->getId if defined $tag;
+	$f->hidden(
+		-name=>"tagId",
+		-value=>$value,
+		-defaultValue=>"new"
+		);
+	my $value = $tag->get("name") if defined $tag;
 	$f->text(
 		-name=>"name",
 		-label=>$i18n->get("version tag name"),
 		-hoverHelp=>$i18n->get("version tag name description"),
-		-value=>$tag->{name},
+		-value=>$value,
 		);
+	my $workflowId = (defined $tag) ? $tag->get("workflowId") : $session->setting->get("defaultVersionTagWorkflow");
+	my $groupId = (defined $tag) ? $tag->get("groupToUse") : "12";
+	if ($session->user->isInGroup("pbgroup000000000000016")) {
+		$f->workflow(
+			value=>$workflowId,
+			type=>"WebGUI::VersionTag"
+			);
+		$f->group(
+			value=>[$groupId],
+			name=>"groupToUse",
+			label=>$i18n->get("group to use"),
+			hoverHelp=>$i18n->get("group to use help")
+			);
+	} else {
+		$f->hidden(
+			value=>$workflowId,
+			name=>"workflowId"
+			);
+		$f->hidden(
+			value=>$groupId,
+			name=>"groupToUse"
+			);
+	}
 	$f->submit;
-        return $ac->render($f->print,$i18n->get("add version tag"));	
+        return $ac->render($f->print,$i18n->get("edit version tag"));	
 }
 
 
 #-------------------------------------------------------------------
 
-=head2 www_addVersionTagSave ()
+=head2 www_editVersionTagSave ( session )
 
 Adds a version tag and sets the user's default version tag to that.
 
+=head3 session
+
+A reference to the current session.
+
 =cut
 
-sub www_addVersionTagSave {
-	my $self = shift;
-        return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
-	$self->addVersionTag($self->session->form->process("name"));
-	return $self->www_manageVersions();
+sub www_editVersionTagSave {
+	my $session = shift;
+        return $session->session->privilege->insufficient() unless ($session->user->isInGroup(12));
+	if ($session->form->param("tagId") eq "new") {
+		my $tag = WebGUI::VersionTag->create($session, {
+			name=>$session->form->process("name","text", "Untitled"),
+			groupToUse=>$session->form->process("groupToUse","group","12"),
+			workflowId=>$session->form->process("workflowId","workflow", $session->setting->get("defaultVersionTagWorkflow"))
+			});
+		$tag->setWorking;
+	} else {
+		my $tag = WebGUI::VersionTag->new($session, $session->form->param("tagId"));
+		$tag->set({
+			name=>$session->form->process("name","text", "Untitled"),
+			groupToUse=>$session->form->process("groupToUse","group","12"),
+			workflowId=>$session->form->process("workflowId","workflow", $session->setting->get("defaultVersionTagWorkflow"))
+			});
+	}
+	return www_manageVersions($session);
 }
 
 
 #-------------------------------------------------------------------
 
+=head2 www_commitVersionTag ( session )
+
+Commits a version tag.
+
+=head3 session
+
+A reference to the current session.
+
+=cut
+
 sub www_commitVersionTag {
 	my $session = shift;
-	return $session->privilege->adminOnly() unless $session->user->isInGroup(3);
-	my $tagId = $session->form->process("tagId");
+	my $tagId = $session->form->param("tagId");
 	if ($tagId) {
 		my $tag = WebGUI::VersionTag->new($session, $tagId);
-		$tag->commit if (defined $tag);
+		$tag->commit if (defined $tag && $session->user->isInGroup($tag->get("groupToUse")));
 	}
 	if ($session->form->get("backToSite")) {
 		return "";
@@ -103,31 +171,35 @@ sub www_commitVersionTag {
 
 #-------------------------------------------------------------------
 
-=head2 www_manageVersionTags ()
+=head2 www_manageCommittedVersions ( session )
 
 Shows a list of the currently available asset version tags.
 
+=head3 session
+
+A reference to the current session.
+
 =cut
 
 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($self->session,"Asset");
+        my $session = shift;
+        return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
+        my $ac = WebGUI::AdminConsole->new($session,"versions");
+        my $i18n = WebGUI::International->new($session,"VersionTag");
 	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"));
-        $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
+        $ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
+        $ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
         my $output = '<table width=100% class="content">
-        <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");
+        <tr><th>'.$i18n->get("version tag name").'</th><th>'.$i18n->get("committed on").'</th><th>'.$i18n->get("committed by").'</th><th></th></tr> ';
+        my $sth = $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($self->session,$by);
+                my $u = WebGUI::User->new($session,$by);
                 $output .= '<tr>
-			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
-			<td>'.$self->session->datetime->epochToHuman($date).'</td>
+			<td><a href="'.$session->url->page("op=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
+			<td>'.$session->datetime->epochToHuman($date).'</td>
 			<td>'.$u->username.'</td>
-			<td><a href="'.$self->getUrl("proceed=manageCommittedVersions;func=rollbackVersionTag;tagId=".$id).'" onclick="return confirm(\''.$rollbackPrompt.'\');">'.$rollback.'</a></td></tr>';
+			<td><a href="'.$session->url->page("proceed=manageCommittedVersions;op=rollbackVersionTag;tagId=".$id).'" onclick="return confirm(\''.$rollbackPrompt.'\');">'.$rollback.'</a></td></tr>';
         }
         $sth->finish;
         $output .= '</table>';
@@ -137,40 +209,48 @@ sub www_manageCommittedVersions {
 
 #-------------------------------------------------------------------
 
-=head2 www_manageVersionTags ()
+=head2 www_manageVersions ( session )
 
 Shows a list of the currently available asset version tags.
 
+=head3 session
+
+A reference to the current session.
+
 =cut
 
 sub www_manageVersions {
-	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($self->session,"Asset");
+	my $session = shift;
+        return $session->privilege->insufficient() unless ($session->user->isInGroup(12));
+        my $ac = WebGUI::AdminConsole->new($session,"versions");
+	my $i18n = WebGUI::International->new($session,"VersionTag");
 	$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"));
-	my ($tag) = $self->session->db->quickArray("select name from assetVersionTag where tagId=".$self->session->db->quote($self->session->scratch->get("versionTag")));
+	$ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
+	$ac->addSubmenuItem($session->url->page('op=manageCommittedVersions'), $i18n->get("manage committed versions")) if ($session->user->isInGroup(3));
+	my ($tag) = $session->db->quickArray("select name from assetVersionTag where tagId=?",[$session->scratch->get("versionTag")]);
 	$tag ||= "None";
 	my $rollback = $i18n->get("rollback");
 	my $commit = $i18n->get("commit");
 	my $setTag = $i18n->get("set tag");
 	my $rollbackPrompt = $i18n->get("rollback version tag confirm");
 	my $commitPrompt = $i18n->get("commit version tag confirm");
-	my $output = '<p>You are currently working under a tag called: <b>'.$tag.'</b>.</p><table width=100% class="content">
-	<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($self->session,$by);
+	my $output = '<p>'.$i18n->get("current tag is called").': <b>'.$tag.'</b>.</p><table width=100% class="content">
+	<tr><th></th><th>'.$i18n->get("version tag name").'</th><th>'.$i18n->get("created on").'</th><th>'.$i18n->get("created by").'</th><th></th></tr> ';
+	my $sth = $session->db->read("select tagId,name,creationDate,createdBy,groupToUse from assetVersionTag where isCommitted=0 and isLocked=0");
+	while (my ($id,$name,$date,$by,$group) = $sth->array) {
+		next unless ($session->user->isInGroup($group));
+		my $u = WebGUI::User->new($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>
-			<td>'.$self->session->datetime->epochToHuman($date).'</td>
+			<td>'
+				.$session->icon->delete("op=rollbackVersionTag;tagId=".$id,undef,$rollbackPrompt)
+				.$session->icon->edit("op=editVersionTag;tagId=".$id)
+			.'</td>
+			<td><a href="'.$session->url->page("op=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
+			<td>'.$session->datetime->epochToHuman($date).'</td>
 			<td>'.$u->username.'</td>
 			<td>
-			<a href="'.$self->getUrl("func=setVersionTag;tagId=".$id).'">'.$setTag.'</a> |
-			<a href="'.$self->getUrl("func=commitVersionTag;tagId=".$id).'" onclick="return confirm(\''.$commitPrompt.'\');">'.$commit.'</a></td></tr>';
+			<a href="'.$session->url->page("op=setVersionTag;tagId=".$id).'">'.$setTag.'</a> |
+			<a href="'.$session->url->page("op=commitVersionTag;tagId=".$id).'" onclick="return confirm(\''.$commitPrompt.'\');">'.$commit.'</a></td></tr>';
 	}
 	$sth->finish;	
 	$output .= '</table>';
@@ -180,66 +260,98 @@ sub www_manageVersions {
 
 #-------------------------------------------------------------------
 
+=head2 www_manageRevisionsInTag ( session )
+
+Displays a list of the revsions associated with this tag.
+
+=head3 session
+
+A reference to the current session.
+
+=cut
+
 sub www_manageRevisionsInTag {
-	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($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"));
+	my $session = shift;
+	my $tagId = $session->form->get("tagId");
+	my $tag = WebGUI::VersionTag->new($session, $tagId);
+        return $session->privilege->insufficient() unless ($session->user->isInGroup($tag->get("groupToUse")));
+	my $ac = WebGUI::AdminConsole->new($session,"versions");
+        my $i18n = WebGUI::International->new($session,"VersionTag");
+	$ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
+	$ac->addSubmenuItem($session->url->page('op=manageCommittedVersions'), $i18n->get("manage committed versions")) if ($session->user->isInGroup(3));
+        $ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
         my $output = '<table width=100% class="content">
-        <tr><th></th><th>Title</th><th>Type</th><th>Revision Date</th><th>Revised By</th></tr> ';
-	my $p = WebGUI::Paginator->new($self->session,$self->getUrl("func=manageRevisionsInTag;tagId=".$self->session->form->process("tagId")));
+        <tr><th></th><th>'.$i18n->get("title","Asset").'</th><th>'.$i18n->get("type","Asset").'</th><th>'.$i18n->get("revision date","Asset").'</th><th>'.$i18n->get("revised by","Asset").'</th></tr> ';
+	my $p = WebGUI::Paginator->new($session,$session->url->page("op=manageRevisionsInTag;tagId=".$session->form->process("tagId")));
 	$p->setDataByQuery("select assetData.revisionDate, users.username, asset.assetId, asset.className from assetData 
 		left join asset on assetData.assetId=asset.assetId left join users on assetData.revisedBy=users.userId
-		where assetData.tagId=".$self->session->db->quote($self->session->form->process("tagId")));
+		where assetData.tagId=?",undef, undef, [$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($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>
+		my $asset = WebGUI::Asset->new($session,$id,$class,$date);
+                $output .= '<tr><td>'.$session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$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>
-			<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
+			<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.$session->datetime->epochToHuman($date).'</a></td>
 			<td>'.$by.'</td></tr>';
         }
         $output .= '</table>'.$p->getBarSimple;
-	my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId"));
+	my $tag = $session->db->getRow("assetVersionTag","tagId",$session->form->process("tagId"));
         return $ac->render($output,$i18n->get("revisions in tag").": ".$tag->{name});
 }
 
 
-#-------------------------------------------------------------------A
+#-------------------------------------------------------------------
+
+=head2 www_rollbackVersionTag ( session )
+
+Deletes a version tag and all asset revisions attached to it.
+
+=head2 session
+
+A reference to the current session.
+
+=cut
 
 sub www_rollbackVersionTag {
-	my $self = shift;
-	return $self->session->privilege->adminOnly() unless $self->session->user->isInGroup(3);
-	return $self->session->privilege->vitalComponent() if ($self->session->form->process("tagId") eq "pbversion0000000000001" || $self->session->form->process("tagId") eq "pbversion0000000000002");
-	my $tagId = $self->session->form->process("tagId");
+	my $session = shift;
+	return $session->privilege->adminOnly() unless $session->user->isInGroup(3);
+	my $tagId = $session->form->process("tagId");
+	return $session->privilege->vitalComponent() if ($tagId eq "pbversion0000000000001");
 	if ($tagId) {
-		$self->rollbackVersionTag($tagId);
+		my $tag = WebGUI::VersionTag->new($session, $tagId);
+		$tag->rollback if defined $tag;
 	}
-	if ($self->session->form->process("proceed") eq "manageCommittedVersions") {
-		return $self->www_manageCommittedVersions;
+	if ($session->form->process("proceed") eq "manageCommittedVersions") {
+		return www_manageCommittedVersions($session);
 	}
-	return $self->www_manageVersions;
+	return www_manageVersions($session);
 }
 
 
 
 #-------------------------------------------------------------------
 
-=head2 www_setVersionTag ()
+=head2 www_setVersionTag ( session )
 
 Sets the current user's working version tag.
 
+=head3 session
+
+A reference to the current session.
+
 =cut
 
 sub www_setVersionTag () {
-	my $self = shift;
-	return $self->session->privilege->insufficient() unless $self->session->user->isInGroup(12);
-	$self->session->scratch->set("versionTag",$self->session->form->process("tagId"));
-	return $self->www_manageVersions();
+	my $session = shift;
+	my $tag = WebGUI::VersionTag->new($session, $session->form->process("tagId"));
+	if (defined $tag && $session->user->isInGroup($tag->get("groupToUse"))) {
+		$tag->setWorking();
+	}
+	if ($session->form->param("backToSite")) {
+		return undef;
+	}
+	return www_manageVersions($session);
 }
 
 
diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm
index 6fee65658..8cfb3c7bf 100644
--- a/lib/WebGUI/VersionTag.pm
+++ b/lib/WebGUI/VersionTag.pm
@@ -75,7 +75,9 @@ sub create {
 		creationDate=>$session->datetime->time(),
 		createdBy=>$session->user->userId
 		});
-	return $tagId;
+	my $tag = $class->new($session, $tagId);
+	$tag->set($properties);
+	return $tag;
 } 
 
 
@@ -92,8 +94,8 @@ sub commit {
 	foreach my $asset (@{$self->getAssets}) {
 		$asset->commit;
 	}
-	$self->{_data}{isCommited} = 1;
-	$self->{_data}{commitedBy} = $self->session->user->userId;
+	$self->{_data}{isCommitted} = 1;
+	$self->{_data}{committedBy} = $self->session->user->userId;
 	$self->{_data}{commitDate} = $self->session->datetime->time();
 	$self->session->db->setRow("assetVersionTag", "tagId", $self->{_data});
 	$self->clearWorking;
@@ -177,7 +179,7 @@ sub getWorking {
 			return undef;
 		} else {
 			my $tag = $class->create($session);
-			$tag->setAsWorking;
+			$tag->setWorking;
 			return $tag;	
 		}
 	}
@@ -283,16 +285,21 @@ A human readable name.
 
 =head4 workflowId
 
-The ID of the workflow that will be triggered when this workflow is committed.
+The ID of the workflow that will be triggered when this workflow is committed. Defaults to the default version tag workflow set in the settings.
+
+=head4 groupToUse
+
+The ID of the group that's allowed to use this tag. Defaults to the turn admin on group.
 
 =cut
 
 sub set {
 	my $self = shift;
 	my $properties = shift;
-	$self->{_data}{name} = $properties->{name} || $self->{_data}{name} || "Autotag created ".$self->session->datetime->epochToHuman()." by ".$self->session->user->username;
-	$self->{_data}{workflowId} = $properties->{workflowId} || $self->{_data}{workflowId};
-	$self->session->db->setRow("Workflow","workflowId",$self->{_data});
+	$self->{_data}{name} = $properties->{name} || $self->{_data}{name} || "(Autotag) ".$self->session->datetime->epochToHuman()." / ".$self->session->user->username;
+	$self->{_data}{workflowId} = $properties->{workflowId} || $self->{_data}{workflowId} || $self->session->setting->get("defaultVersionTagWorkflow");
+	$self->{_data}{groupToUse} = $properties->{groupToUse} || $self->{_data}{groupToUse} || "12";
+	$self->session->db->setRow("assetVersionTag","tagId",$self->{_data});
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Workflow/Activity/CommitVersionTag.pm b/lib/WebGUI/Workflow/Activity/CommitVersionTag.pm
index 4122b2420..6fc64a99c 100644
--- a/lib/WebGUI/Workflow/Activity/CommitVersionTag.pm
+++ b/lib/WebGUI/Workflow/Activity/CommitVersionTag.pm
@@ -50,9 +50,9 @@ sub definition {
 	my $class = shift;
 	my $session = shift;
 	my $definition = shift;
-	my $i18n = WebGUI::International->new($session, "Workflow_Activity_CommitVersionTag");
+	my $i18n = WebGUI::International->new($session, "VersionTag");
 	push(@{$definition}, {
-		name=>$i18n->get("topicName"),
+		name=>$i18n->get("commit version tag"),
 		properties=> { }
 		});
 	return $class->SUPER::definition($session,$definition);
diff --git a/lib/WebGUI/Workflow/Activity/RollbackVersionTag.pm b/lib/WebGUI/Workflow/Activity/RollbackVersionTag.pm
index a6bc204d5..70f342f3a 100644
--- a/lib/WebGUI/Workflow/Activity/RollbackVersionTag.pm
+++ b/lib/WebGUI/Workflow/Activity/RollbackVersionTag.pm
@@ -50,9 +50,9 @@ sub definition {
 	my $class = shift;
 	my $session = shift;
 	my $definition = shift;
-	my $i18n = WebGUI::International->new($session, "Workflow_Activity_RollbackVersionTag");
+	my $i18n = WebGUI::International->new($session, "VersionTag");
 	push(@{$definition}, {
-		name=>$i18n->get("topicName"),
+		name=>$i18n->get("rollback version tag"),
 		properties=> { }
 		});
 	return $class->SUPER::definition($session,$definition);
diff --git a/lib/WebGUI/Workflow/Activity/TrashVersionTag.pm b/lib/WebGUI/Workflow/Activity/TrashVersionTag.pm
index de693c948..ba87838ee 100644
--- a/lib/WebGUI/Workflow/Activity/TrashVersionTag.pm
+++ b/lib/WebGUI/Workflow/Activity/TrashVersionTag.pm
@@ -50,9 +50,9 @@ sub definition {
 	my $class = shift;
 	my $session = shift;
 	my $definition = shift;
-	my $i18n = WebGUI::International->new($session, "Workflow_Activity_TrashVersionTag");
+	my $i18n = WebGUI::International->new($session, "VersionTag");
 	push(@{$definition}, {
-		name=>$i18n->get("topicName"),
+		name=>$i18n->get("trash version tag"),
 		properties=> { }
 		});
 	return $class->SUPER::definition($session,$definition);
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index 2aa40166d..154d4b43f 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -49,61 +49,12 @@ our $I18N = {
 		context => q|The prompt for purging a revision from the asset tree.|
 	},
 
-	'rollback version tag confirm' => {
-		message => q|Are you certain you wish to delete this version tag and all content created under it? It CANNOT be restored if you delete it.|,
-		lastUpdated => 0,
-		context => q|The prompt for purging a version tag from the asset tree.|
-	},
-
-	'commit version tag confirm' => {
-		message => q|Are you certain you wish to commit this version tag and everything edited under it?|,
-		lastUpdated => 0,
-		context => q|The prompt for committing a version tag to the asset tree.|
-	},
-
-	'enable autocommit of asset versioning' => {
-		message => q|Enable autocommit of asset versioning?|,
-		lastUpdated => 0,
-		context => q|A label for the toggle for asset versioning.|
-	},
-
-	'enable autocommit of asset versioning description' => {
-		message => q|Setting this to "Yes", the default, makes WebGUI's content version system
-do a commit immediately after an edit occurs.|,
-		lastUpdated => 1140546767,
-		context => q|Hover help for the toggle for asset versioning.|
-	},
-
 	'purge' => {
 		message => q|Purge|,
 		lastUpdated => 0,
 		context => q|The label for the purge button in the trash manager.|
 	},
 
-	'set tag' => {
-		message => q|Set As Working Tag|,
-		lastUpdated => 0,
-		context => q|The label for choosing as a tag to work under.|
-	},
-
-	'revisions in tag' => {
-		message => q|Revisions In Tag|,
-		lastUpdated => 0,
-		context => q|The label for displaying the revisions created under a specific tag.|
-	},
-
-	'commit' => {
-		message => q|Commit|,
-		lastUpdated => 0,
-		context => q|The label for committing a tag to the asset tree.|
-	},
-
-	'rollback' => {
-		message => q|Rollback|,
-		lastUpdated => 0,
-		context => q|The label for purging a revision from the asset tree.|
-	},
-
 	'locked' => {
 		message => q|Locked|,
 		lastUpdated => 0,
@@ -116,59 +67,24 @@ do a commit immediately after an edit occurs.|,
 		context => q|Context menu item.|
 	},
 
-	'manage versions' => {
-		message => q|Manage versions.|,
-		lastUpdated => 0,
-		context => q|Menu item in version tag manager.|
-	},
-
-	'manage committed versions' => {
-		message => q|Manage committed versions.|,
-		lastUpdated => 0,
-		context => q|Menu item in version tag manager.|
-	},
-
-	'add version tag' => {
-		message => q|Add Version Tag|,
-		lastUpdated => 0,
-		context => q|Admin console label.|
-	},
-
-	'version tag name' => {
-		message => q|Version Tag Name|,
-		lastUpdated => 1129403466,
-		context => q|Admin console label.|
-	},
-
-	'version tag name description' => {
-		message => q|<p>Enter a name to tag the work you will do on this version of the asset.  The tag will be used to reference this work when it is time to commit, rollback or make further edits.</p>|,
-		lastUpdated => 1129403469,
-	},
-
-	'content versioning' => {
-		message => q|Content Versioning|,
-		lastUpdated => 0,
-		context => q|Admin console label.|
-	},
-
-	'committed versions' => {
-		message => q|Committed Versions|,
-		lastUpdated => 0,
-		context => q|Admin console label.|
-	},
-
-	'add a version tag' => {
-		message => q|Add a version tag.|,
-		lastUpdated => 0,
-		context => q|Menu item in version tag manager.|
-	},
-
 	'rank' => {
 		message => q|Rank|,
 		lastUpdated => 0,
 		context => q|Column heading in asset manager.|
 	},
 	
+	'revised by' => {
+		message => q|Revised By|,
+		lastUpdated => 0,
+		context => q|manage revisions in tag|
+	},
+	
+	'revision date' => {
+		message => q|Revision Date|,
+		lastUpdated => 0,
+		context => q|manage revisions in tag|
+	},
+	
 	'type' => {
 		message => q|Type|,
 		lastUpdated => 0,
diff --git a/lib/WebGUI/i18n/English/VersionTag.pm b/lib/WebGUI/i18n/English/VersionTag.pm
new file mode 100644
index 000000000..b2f431233
--- /dev/null
+++ b/lib/WebGUI/i18n/English/VersionTag.pm
@@ -0,0 +1,150 @@
+package WebGUI::i18n::English::VersionTag;
+
+our $I18N = {
+	'current tag is called' => {
+		message => q|You are currently working under a tag called|,
+		lastUpdated => 0,
+		context => q|manage version tags|
+	},
+
+	'created on' => {
+		message => q|Created On|,
+		lastUpdated => 0,
+		context => q|manage version tags|
+	},
+
+	'created by' => {
+		message => q|Created By|,
+		lastUpdated => 0,
+		context => q|manage version tags|
+	},
+
+	'committed on' => {
+		message => q|Commited On|,
+		lastUpdated => 0,
+		context => q|manage committed versions|
+	},
+
+	'committed by' => {
+		message => q|Committed By|,
+		lastUpdated => 0,
+		context => q|manage committed versions|
+	},
+
+	'group to use' => {
+		message => q|Group To Use|,
+		lastUpdated => 0,
+		context => q|version tag editor|
+	},
+
+	'trash version tag' => {
+		message => q|Trash Version Tag|,
+		context => q|The name of the workflow activity.|,
+		lastUpdated => 0,
+	},
+
+	'rollback version tag' => {
+		message => q|Rollback Version Tag|,
+		context => q|The name of the workflow activity.|,
+		lastUpdated => 0,
+	},
+
+	'commit version tag' => {
+		message => q|Commit Version Tag|,
+		context => q|The name of the workflow activity.|,
+		lastUpdated => 0,
+	},
+
+	'group to use help' => {
+		message => q|Which group is allowed to use this tag?|,
+		lastUpdated => 0,
+		context => q|hover help for group to use field|
+	},
+
+	'rollback version tag confirm' => {
+		message => q|Are you certain you wish to delete this version tag and all content created under it? It CANNOT be restored if you delete it.|,
+		lastUpdated => 0,
+		context => q|The prompt for purging a version tag from the asset tree.|
+	},
+
+	'commit version tag confirm' => {
+		message => q|Are you certain you wish to commit this version tag and everything edited under it?|,
+		lastUpdated => 0,
+		context => q|The prompt for committing a version tag to the asset tree.|
+	},
+
+	'set tag' => {
+		message => q|Set As Working Tag|,
+		lastUpdated => 0,
+		context => q|The label for choosing as a tag to work under.|
+	},
+
+	'revisions in tag' => {
+		message => q|Revisions In Tag|,
+		lastUpdated => 0,
+		context => q|The label for displaying the revisions created under a specific tag.|
+	},
+
+	'commit' => {
+		message => q|Commit|,
+		lastUpdated => 0,
+		context => q|The label for committing a tag to the asset tree.|
+	},
+
+	'rollback' => {
+		message => q|Rollback|,
+		lastUpdated => 0,
+		context => q|The label for purging a revision from the asset tree.|
+	},
+
+	'manage versions' => {
+		message => q|Manage versions.|,
+		lastUpdated => 0,
+		context => q|Menu item in version tag manager.|
+	},
+
+	'manage committed versions' => {
+		message => q|Manage committed versions.|,
+		lastUpdated => 0,
+		context => q|Menu item in version tag manager.|
+	},
+
+	'edit version tag' => {
+		message => q|Edit Version Tag|,
+		lastUpdated => 0,
+		context => q|Admin console label.|
+	},
+
+	'version tag name' => {
+		message => q|Version Tag Name|,
+		lastUpdated => 1129403466,
+		context => q|Admin console label.|
+	},
+
+	'version tag name description' => {
+		message => q|<p>Enter a name to tag the work you will do on this version of the asset.  The tag will be used to reference this work when it is time to commit, rollback or make further edits.</p>|,
+		lastUpdated => 1129403469,
+	},
+
+	'content versioning' => {
+		message => q|Content Versioning|,
+		lastUpdated => 0,
+		context => q|Admin console label.|
+	},
+
+	'committed versions' => {
+		message => q|Committed Versions|,
+		lastUpdated => 0,
+		context => q|Admin console label.|
+	},
+
+	'add a version tag' => {
+		message => q|Add a version tag.|,
+		lastUpdated => 0,
+		context => q|Menu item in version tag manager.|
+	},
+
+
+};
+
+1;
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 602f34d86..cb9bd2b96 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -1,6 +1,18 @@
 package WebGUI::i18n::English::WebGUI;
 
 our $I18N = {
+	'default version tag workflow help' => {
+		message => q|Which workflow should be used by default when user's create their own version tags.|,
+		lastUpdated => 0,
+		context=>"Settings hover help"
+	},
+
+	'default version tag workflow' => {
+		message => q|Default Version Tag Workflow|,
+		lastUpdated => 0,
+		context=>"Settings"
+	},
+
 	'expire groupings' => {
 		message => q|Expire User Groupings|,
 		lastUpdated => 0
diff --git a/lib/WebGUI/i18n/English/Workflow_Activity_CommitVersionTag.pm b/lib/WebGUI/i18n/English/Workflow_Activity_CommitVersionTag.pm
deleted file mode 100644
index b0de33583..000000000
--- a/lib/WebGUI/i18n/English/Workflow_Activity_CommitVersionTag.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package WebGUI::i18n::English::Workflow_Activity_CommitVersionTag;
-
-our $I18N = {
-
-	'topicName' => {
-		message => q|Commit Version Tag|,
-		context => q|The name of this workflow activity.|,
-		lastUpdated => 0,
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Workflow_Activity_RollbackVersionTag.pm b/lib/WebGUI/i18n/English/Workflow_Activity_RollbackVersionTag.pm
deleted file mode 100644
index 2d6893ec0..000000000
--- a/lib/WebGUI/i18n/English/Workflow_Activity_RollbackVersionTag.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package WebGUI::i18n::English::Workflow_Activity_RollbackVersionTag;
-
-our $I18N = {
-
-	'topicName' => {
-		message => q|Rollback Version Tag|,
-		context => q|The name of this workflow activity.|,
-		lastUpdated => 0,
-	},
-
-};
-
-1;
diff --git a/lib/WebGUI/i18n/English/Workflow_Activity_TrashVersionTag.pm b/lib/WebGUI/i18n/English/Workflow_Activity_TrashVersionTag.pm
deleted file mode 100644
index e75fd172b..000000000
--- a/lib/WebGUI/i18n/English/Workflow_Activity_TrashVersionTag.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package WebGUI::i18n::English::Workflow_Activity_TrashVersionTag;
-
-our $I18N = {
-
-	'topicName' => {
-		message => q|Trash Version Tag|,
-		context => q|The name of this workflow activity.|,
-		lastUpdated => 0,
-	},
-
-};
-
-1;