Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java
===================================================================
diff -u -rd9e5194732537256537b5e5896cf9656f2f9a435 -rc0668a32ab1e1be5f61210902e17a44900d82c50
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	(.../CompleteActivity.java)	(revision d9e5194732537256537b5e5896cf9656f2f9a435)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivity.java	(.../CompleteActivity.java)	(revision c0668a32ab1e1be5f61210902e17a44900d82c50)
@@ -87,7 +87,7 @@
 		sessionBean.setLearnerProgress(progress);
 		setSessionBean(sessionBean, request);
 
-		ActionForward forward = actionMappings.getNextActivityForward(progress, true);
+		ActionForward forward = actionMappings.getProgressForward(progress, true);
 		
 		return forward;
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java
===================================================================
diff -u -r2f16c59fb81be95b6050befbb7591f89e318e1c9 -rc0668a32ab1e1be5f61210902e17a44900d82c50
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java	(.../ActionMappings.java)	(revision 2f16c59fb81be95b6050befbb7591f89e318e1c9)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappings.java	(.../ActionMappings.java)	(revision c0668a32ab1e1be5f61210902e17a44900d82c50)
@@ -18,7 +18,7 @@
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.LessonCompleteActivity;
-import org.lamsfoundation.lams.lesson.NullActivity;
+import org.lamsfoundation.lams.learningdesign.NullActivity;
 import org.lamsfoundation.lams.lesson.ParallelWaitActivity;
 
 /**
@@ -65,7 +65,7 @@
 	 * @param redirect, If true a RedirectActionForward is used
 	 * @return
 	 */
-	public ActionForward getNextActivityForward(LearnerProgress progress, boolean redirect) {
+	public ActionForward getProgressForward(LearnerProgress progress, boolean redirect) {
 	    ActionForward actionForward = null;
 
 		Activity nextActivity = progress.getNextActivity();
@@ -114,11 +114,9 @@
 	 * Note that this method always returns a LAMS URLs, if a ToolActivity is next
 	 * the URL will be the action for displaying the tool.
 	 * Note that the URL could also be a wait message or a jsp to clear the frames.
-	 * @param previousProgress, the previous LearnerProgress before an activity was
-	 * completed.
 	 * @param progress, the current LearnerProgress.
 	 */
-	public ActivityURL getNextActivityURL(LearnerProgress previousProgress, LearnerProgress progress) {
+	public ActivityURL getProgressURL(LearnerProgress progress) {
 		ActivityURL activityURL = null;
 
 		Activity nextActivity = progress.getNextActivity();
@@ -148,6 +146,8 @@
 	 * Generates an ActivityURL for a Tool Activity. The URL is for the tool and
 	 * not for the tool loading page. The URL also includes toolSessionId and all
 	 * other required data.
+	 * @param activity, the ToolActivity to be displayed
+	 * @param progress, the current LearnerProgress, used to get activity status
 	 */
 	public ActivityURL getToolURL(ToolActivity activity, LearnerProgress progress) {
 		ActivityURL activityURL = new ActivityURL();
@@ -165,7 +165,7 @@
 	/**
 	 * Returns the struts action used to display the specified activity.
 	 * @param activity, Activity to be displayed
-	 * @param progress, LearnerProgress for the activity
+	 * @param progress, LearnerProgress for the activity, used to check activity status
 	 * @return String representing a struts action
 	 */
 	protected String getActivityAction(Activity activity, LearnerProgress progress) {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java
===================================================================
diff -u -r2f16c59fb81be95b6050befbb7591f89e318e1c9 -rc0668a32ab1e1be5f61210902e17a44900d82c50
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java	(.../ActionMappingsWithToolWait.java)	(revision 2f16c59fb81be95b6050befbb7591f89e318e1c9)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActionMappingsWithToolWait.java	(.../ActionMappingsWithToolWait.java)	(revision c0668a32ab1e1be5f61210902e17a44900d82c50)
@@ -5,8 +5,6 @@
 package org.lamsfoundation.lams.learning.web.util;
 
 import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ForwardingActionForward;
-import org.apache.struts.action.RedirectingActionForward;
 import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ComplexActivity;
@@ -18,7 +16,7 @@
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.LessonCompleteActivity;
-import org.lamsfoundation.lams.lesson.NullActivity;
+import org.lamsfoundation.lams.learningdesign.NullActivity;
 import org.lamsfoundation.lams.lesson.ParallelWaitActivity;
 
 /**
@@ -52,24 +50,8 @@
 	 * @param redirect, If true a RedirectActionForward is used
 	 * @return
 	 */
-	public ActionForward getNextActivityForward(LearnerProgress progress, boolean redirect) {
-	    return super.getNextActivityForward(progress, redirect);
-	    /*ActionForward actionForward = null;
-
-		Activity nextActivity = progress.getNextActivity();
-		Activity previousActivity = progress.getPreviousActivity();
-		Activity currentActivity = progress.getCurrentActivity();
-		
-		if (previousActivity instanceof ParallelActivity) {
-		    // clear frameset
-		    String strutsAction = "/requestDisplay.do";
-		    actionForward = strutsActionToForward(strutsAction, nextActivity, redirect);
-		}
-		else {
-			actionForward = getActivityForward(nextActivity, progress, redirect);
-		}
-
-		return actionForward;*/
+	public ActionForward getProgressForward(LearnerProgress progress, boolean redirect) {
+	    return super.getProgressForward(progress, redirect);
 	}
 	
 	/**
@@ -96,11 +78,9 @@
 	 * Note that this method always returns a LAMS URLs, if a ToolActivity is next
 	 * the URL will be the action for displaying the tool.
 	 * Note that the URL could also be a wait message or a jsp to clear the frames.
-	 * @param previousProgress, the previous LearnerProgress before an activity was
-	 * completed.
 	 * @param progress, the current LearnerProgress.
 	 */
-	public ActivityURL getNextActivityURL(LearnerProgress previousProgress, LearnerProgress progress) {
+	public ActivityURL getProgressURL(LearnerProgress progress) {
 		ActivityURL activityURL = null;
 
 		Activity nextActivity = progress.getNextActivity();
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java
===================================================================
diff -u -rb2e0eb0d4ede04293fa500a2aca5597226446aae -rc0668a32ab1e1be5f61210902e17a44900d82c50
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision b2e0eb0d4ede04293fa500a2aca5597226446aae)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision c0668a32ab1e1be5f61210902e17a44900d82c50)
@@ -175,8 +175,8 @@
     	Activity activity = getActivity(toolSessionId, progress);
     	
     	String url = null;
-    	LearnerProgress nextLearnerProgress = calculateProgress(activity, learner, lesson);
-    	ActivityURL activityURL = actionMappings.getNextActivityURL(progress, nextLearnerProgress);
+    	progress = calculateProgress(activity, learner, lesson);
+    	ActivityURL activityURL = actionMappings.getProgressURL(progress);
     	url = activityURL.getUrl();
     	
     	return url;