diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index ab6feaa..100b701 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -120,6 +120,7 @@ namespace EduNetworkBuilder
             dest.PuzzleName = source.PuzzleName;
             dest.NetMessage = new LanguageStrings(source.NetMessage);
             dest.WhatFrom = source.WhatFrom; //We remember the schoolwork class we came from.
+            dest.PuzzleIsSolved = source.PuzzleIsSolved;
         }
 
         public Network Clone()
@@ -898,13 +899,28 @@ namespace EduNetworkBuilder
             //kill all extra windows that no longer need to be open.
             KillAllExtraWindows();
 
-            DialogResult answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"),NB.Translate("_Solved"),MessageBoxButtons.YesNo);
-
-            if (answer == DialogResult.Yes)
+            if (WhatFrom == null)
             {
-                KillAllExtraWindows(true);
-                ListBoxWindow LBW = new ListBoxWindow();
-                LBW.ShowDialog();
+                DialogResult answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"), NB.Translate("_Solved"), MessageBoxButtons.YesNo);
+
+                if (answer == DialogResult.Yes)
+                {
+                    KillAllExtraWindows(true);
+                    ListBoxWindow LBW = new ListBoxWindow();
+                    LBW.ShowDialog();
+                }
+            }
+            else
+            {
+                //It was homework.  Ask if we want to submit it.
+                DialogResult answer = MessageBox.Show(NB.Translate("N_PromptToSubmit"), NB.Translate("_Solved"), MessageBoxButtons.YesNo);
+
+                if (answer == DialogResult.Yes)
+                {
+                    KillAllExtraWindows(true);
+                    BuilderWindow BW = NB.GetBuilderWin();
+                    BW.SubmitHomework();
+                }
             }
         }
 
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 4f91028..fdcdd02 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -2034,7 +2034,7 @@ namespace EduNetworkBuilder
             UpdateMenu();
         }
 
-        private void SubmitHomework()
+        public void SubmitHomework()
         {
             if (myNetwork.WhatFrom == null) return; //We cannot submit it
 
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx
index 0d0028b..8cfb0d5 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.resx
@@ -1881,4 +1881,8 @@
     <value>Name already exists.</value>
     <comment>PC_HWHasName = Name already exists.</comment>
   </data>
+  <data name="N_PromptToSubmit" xml:space="preserve">
+    <value>You have completed the homework.  Would you like to submit it?  If you want to clean it up and submit later, click No.  Go to "Edit" -&gt; "Submit" when you want to submit it.</value>
+    <comment>N_PromptToSubmit = You have completed the homework.  Would you like to submit it?  If you want to clean it up and submit later, click No.  Go to "Edit" -&gt; "Submit" when you want to submit it.</comment>
+  </data>
 </root>
\ No newline at end of file