diff --git a/lib/WebGUI/Asset/EMSSubmissionForm.pm b/lib/WebGUI/Asset/EMSSubmissionForm.pm
index e48a5fa3d..02d9a39bd 100644
--- a/lib/WebGUI/Asset/EMSSubmissionForm.pm
+++ b/lib/WebGUI/Asset/EMSSubmissionForm.pm
@@ -384,6 +384,19 @@ sub getFormDescription {
     return JSON->new->decode($self->get('formDescription'));
 }
 
+#-------------------------------------------------------------------
+=head2 getQueueUrl
+
+returns the URL for the submission queue page with the submisison id in the hash part
+
+=cut
+
+sub getQueueUrl {
+    my $self = shift;
+    return $self->ems->getUrl('func=viewSubmissionQueue#' . $self->getId );
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 getQueueUrl
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index 41e29f6e0..e68251d5a 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -938,6 +938,63 @@ sub www_editBadgeGroupSave {
 
 #-------------------------------------------------------------------
 
+=head2  www_editSubmission 
+
+use getLineage to find the item to edit based on submissionId
+then call www_editSubmission on it
+
+=cut
+
+sub www_editSubmission {
+	my $self             = shift;
+        my $submissionId = $self->session->form->get('submissionId');
+        my $asset = $self->getLineage(['descendants'], { returnObjects => 1,
+		    joinClass          => "WebGUI::Asset::EMSSubmission",
+		    whereClause        => 'submissionId = ' . int($submissionId),
+		    includeOnlyClasses => ['WebGUI::Asset::EMSSubmission'],
+           } );
+        return $asset->[0]->www_editSubmission;
+}
+
+
+#-------------------------------------------------------------------
+
+=head2  www_editSubmissionForm 
+
+calls editSubmissionForm in WebGUI::Asset::EMSSubmissionForm
+
+=cut
+
+sub www_editSubmissionForm {
+	my $self             = shift;
+	return $self->session->privilege->insufficient() unless $self->isRegistrationStaff;
+	return WebGUI::Asset::EMSSubmissionForm->www_editSubmissionForm($self,shift);
+}
+
+
+#-------------------------------------------------------------------
+
+=head2  www_editSubmissionFormSave
+
+test and save data posted from editSubmissionForm...
+
+=cut
+
+sub www_editSubmissionFormSave {
+	my $self = shift;
+	return $self->session->privilege->insufficient() unless $self->isRegistrationStaff;
+	my $formParams = WebGUI::Asset::EMSSubmissionForm->processForm($self);
+        if( $formParams->{_isValid} ) {
+            delete $formParams->{_isValid};
+	    $self->addSubmissionForm($formParams);
+	    return $self->www_viewSubmissionQueue;
+        } else {
+	    return $self->www_editSubmissionForm($formParams);
+	}
+}
+
+#-------------------------------------------------------------------
+
 =head2 www_editEventMetaField ( )
 
 Displays the edit form for event meta fields.
diff --git a/lib/WebGUI/Workflow/Activity/CleanupEMSSubmissions.pm b/lib/WebGUI/Workflow/Activity/CleanupEMSSubmissions.pm
index 3cd147211..6ab880db8 100644
--- a/lib/WebGUI/Workflow/Activity/CleanupEMSSubmissions.pm
+++ b/lib/WebGUI/Workflow/Activity/CleanupEMSSubmissions.pm
@@ -68,10 +68,13 @@ See WebGUI::Workflow::Activity::execute() for details.
 
 =cut
 
+use lib '/root/pb/lib'; use dav;
+
 sub execute {
 	my $self    = shift;
     my $session = $self->session;
     my $root    = WebGUI::Asset->getRoot($session);
+dav::log __PACKAGE__ . " executing\n";
 
     # keep track of how much time it's taking
     my $start   = time;
diff --git a/lib/WebGUI/Workflow/Activity/ProcessEMSApprovals.pm b/lib/WebGUI/Workflow/Activity/ProcessEMSApprovals.pm
index a670a8ba7..44c665473 100644
--- a/lib/WebGUI/Workflow/Activity/ProcessEMSApprovals.pm
+++ b/lib/WebGUI/Workflow/Activity/ProcessEMSApprovals.pm
@@ -69,7 +69,6 @@ See WebGUI::Workflow::Activity::execute() for details.
 
 =cut
 
-
 sub execute {
 	my $self    = shift;
     my $session = $self->session;
diff --git a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
index 67476ea70..e87c15d78 100644
--- a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
+++ b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
@@ -2102,6 +2102,16 @@ normal templates.|,
         context => q|The label for the link to create a new submission form.|,
     },
 
+	'next submission id label' => {
+		message => q|Next Submission Id|,
+		lastUpdated => 1131394072,
+		context => q|Label for the field which indicates the next id used to create a submission.|
+	},
+	'next submission id label help' => {
+		message => q|This is the value that will be used to fill in the first submission, do not edit it.|,
+		lastUpdated => 1131394072,
+		context => q|This is the help text for the 'next submission id' field, the user should be reminded not to edit this field.|
+	},
 #    'TODO' => {
 #        message => q|TODO|,
 #        lastUpdated => 1147050475,