diff --git a/wiki/coursecreation/CourseCreation.png b/wiki/coursecreation/CourseCreation.png
index c40edc90c41..c24a4b77e4a 100644
Binary files a/wiki/coursecreation/CourseCreation.png and b/wiki/coursecreation/CourseCreation.png differ
diff --git a/wiki/coursecreation/CourseCreation.uxf b/wiki/coursecreation/CourseCreation.uxf
index cd97a84a69a..463bb59af3e 100644
--- a/wiki/coursecreation/CourseCreation.uxf
+++ b/wiki/coursecreation/CourseCreation.uxf
@@ -4,8 +4,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>637</x>
-      <y>518</y>
+      <x>812</x>
+      <y>462</y>
       <w>126</w>
       <h>77</h>
     </coordinates>
@@ -21,9 +21,9 @@ shortName : String</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>441</x>
-      <y>637</y>
-      <w>105</w>
+      <x>518</x>
+      <y>581</y>
+      <w>154</w>
       <h>35</h>
     </coordinates>
     <panel_attributes>MarkTemplate
@@ -35,8 +35,8 @@ bg=#fffeb3
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>812</x>
-      <y>448</y>
+      <x>987</x>
+      <y>392</y>
       <w>175</w>
       <h>70</h>
     </coordinates>
@@ -52,8 +52,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>847</x>
-      <y>560</y>
+      <x>1022</x>
+      <y>504</y>
       <w>105</w>
       <h>35</h>
     </coordinates>
@@ -66,8 +66,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>847</x>
-      <y>637</y>
+      <x>1022</x>
+      <y>581</y>
       <w>133</w>
       <h>42</h>
     </coordinates>
@@ -81,8 +81,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>889</x>
-      <y>588</y>
+      <x>1064</x>
+      <y>532</y>
       <w>21</w>
       <h>63</h>
     </coordinates>
@@ -92,8 +92,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>693</x>
-      <y>588</y>
+      <x>868</x>
+      <y>532</y>
       <w>217</w>
       <h>63</h>
     </coordinates>
@@ -103,23 +103,23 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>651</x>
-      <y>637</y>
+      <x>826</x>
+      <y>581</y>
       <w>147</w>
       <h>42</h>
     </coordinates>
     <panel_attributes>Mark
 --
-markTemplate : MarkTemplate
-markProperties : MarkProperties
+originatingMarkTemplate : MarkTemplate
+originatingMarkProperties : MarkProperties
 bg=#ffb3b3</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>693</x>
-      <y>588</y>
+      <x>868</x>
+      <y>532</y>
       <w>21</w>
       <h>63</h>
     </coordinates>
@@ -129,8 +129,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>791</x>
-      <y>644</y>
+      <x>966</x>
+      <y>588</y>
       <w>70</w>
       <h>28</h>
     </coordinates>
@@ -141,8 +141,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>525</x>
-      <y>322</y>
+      <x>630</x>
+      <y>266</y>
       <w>266</w>
       <h>77</h>
     </coordinates>
@@ -157,8 +157,8 @@ bg=#ffb3b3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>532</x>
-      <y>70</y>
+      <x>637</x>
+      <y>14</y>
       <w>273</w>
       <h>91</h>
     </coordinates>
@@ -176,8 +176,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>182</x>
-      <y>182</y>
+      <x>287</x>
+      <y>126</y>
       <w>287</w>
       <h>56</h>
     </coordinates>
@@ -191,8 +191,8 @@ bg=blue</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>182</x>
-      <y>63</y>
+      <x>287</x>
+      <y>7</y>
       <w>287</w>
       <h>49</h>
     </coordinates>
@@ -204,8 +204,8 @@ bg=blue</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>175</x>
-      <y>301</y>
+      <x>280</x>
+      <y>245</y>
       <w>287</w>
       <h>84</h>
     </coordinates>
@@ -221,8 +221,8 @@ bg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>217</y>
+      <x>987</x>
+      <y>161</y>
       <w>329</w>
       <h>42</h>
     </coordinates>
@@ -235,8 +235,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>413</x>
-      <y>560</y>
+      <x>518</x>
+      <y>504</y>
       <w>154</w>
       <h>35</h>
     </coordinates>
@@ -249,8 +249,8 @@ bg=#fffeb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>483</x>
-      <y>588</y>
+      <x>588</x>
+      <y>532</y>
       <w>21</w>
       <h>63</h>
     </coordinates>
@@ -260,19 +260,19 @@ bg=#fffeb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>490</x>
-      <y>588</y>
-      <w>189</w>
+      <x>595</x>
+      <y>532</y>
+      <w>259</w>
       <h>63</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>250.0;10.0;250.0;50.0;10.0;50.0;10.0;70.0</additional_attributes>
+    <additional_attributes>350.0;10.0;350.0;50.0;10.0;50.0;10.0;70.0</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>273</x>
-      <y>637</y>
+      <x>329</x>
+      <y>581</y>
       <w>105</w>
       <h>42</h>
     </coordinates>
@@ -287,31 +287,31 @@ bg=#fffeb3
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>371</x>
-      <y>644</y>
-      <w>84</w>
+      <x>427</x>
+      <y>588</y>
+      <w>105</w>
       <h>28</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;-
 2              1</panel_attributes>
-    <additional_attributes>100.0;20.0;10.0;20.0</additional_attributes>
+    <additional_attributes>130.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>308</x>
-      <y>588</y>
-      <w>196</w>
+      <x>364</x>
+      <y>532</y>
+      <w>245</w>
       <h>63</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>260.0;10.0;260.0;40.0;10.0;40.0;10.0;70.0</additional_attributes>
+    <additional_attributes>330.0;10.0;330.0;40.0;10.0;40.0;10.0;70.0</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>707</y>
+      <x>1057</x>
+      <y>651</y>
       <w>329</w>
       <h>56</h>
     </coordinates>
@@ -327,8 +327,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1029</x>
-      <y>252</y>
+      <x>1204</x>
+      <y>196</y>
       <w>21</w>
       <h>469</h>
     </coordinates>
@@ -338,8 +338,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>581</x>
-      <y>868</y>
+      <x>686</x>
+      <y>812</y>
       <w>329</w>
       <h>35</h>
     </coordinates>
@@ -352,8 +352,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>931</x>
-      <y>868</y>
+      <x>1106</x>
+      <y>812</y>
       <w>154</w>
       <h>35</h>
     </coordinates>
@@ -366,8 +366,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>798</x>
-      <y>917</y>
+      <x>973</x>
+      <y>861</y>
       <w>329</w>
       <h>35</h>
     </coordinates>
@@ -380,8 +380,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1120</x>
-      <y>868</y>
+      <x>1295</x>
+      <y>812</y>
       <w>203</w>
       <h>35</h>
     </coordinates>
@@ -392,8 +392,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1001</x>
-      <y>756</y>
+      <x>1176</x>
+      <y>700</y>
       <w>112</w>
       <h>126</h>
     </coordinates>
@@ -403,8 +403,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1092</x>
-      <y>756</y>
+      <x>1267</x>
+      <y>700</y>
       <w>21</w>
       <h>175</h>
     </coordinates>
@@ -414,8 +414,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1092</x>
-      <y>756</y>
+      <x>1267</x>
+      <y>700</y>
       <w>126</w>
       <h>126</h>
     </coordinates>
@@ -425,8 +425,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>721</x>
-      <y>756</y>
+      <x>896</x>
+      <y>700</y>
       <w>392</w>
       <h>126</h>
     </coordinates>
@@ -436,8 +436,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>504</x>
-      <y>700</y>
+      <x>679</x>
+      <y>644</y>
       <w>238</w>
       <h>49</h>
     </coordinates>
@@ -451,8 +451,8 @@ fixedPosition : FixedPosition
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>609</x>
-      <y>588</y>
+      <x>784</x>
+      <y>532</y>
       <w>70</w>
       <h>126</h>
     </coordinates>
@@ -462,21 +462,23 @@ fixedPosition : FixedPosition
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>574</x>
-      <y>777</y>
-      <w>84</w>
-      <h>35</h>
+      <x>679</x>
+      <y>721</y>
+      <w>238</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>MarkProperties
 --
+lastUsedTemplate : Map&lt;MarkTemplate, TimePoint&gt;
+lastUsedRole : Map&lt;String, Timepoint&gt;
 bg=#b3deff</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>609</x>
-      <y>742</y>
+      <x>784</x>
+      <y>686</y>
       <w>21</w>
       <h>49</h>
     </coordinates>
@@ -486,20 +488,20 @@ bg=#b3deff</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>539</x>
-      <y>644</y>
-      <w>126</w>
+      <x>665</x>
+      <y>588</y>
+      <w>175</w>
       <h>28</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;-
-1  markTemplate  1</panel_attributes>
-    <additional_attributes>160.0;20.0;10.0;20.0</additional_attributes>
+1  originatingMarkTemplate  1</panel_attributes>
+    <additional_attributes>230.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>91</y>
+      <x>987</x>
+      <y>35</y>
       <w>238</w>
       <h>70</h>
     </coordinates>
@@ -513,8 +515,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>994</x>
-      <y>154</y>
+      <x>1099</x>
+      <y>98</y>
       <w>77</w>
       <h>77</h>
     </coordinates>
@@ -526,8 +528,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>889</x>
-      <y>511</y>
+      <x>1064</x>
+      <y>455</y>
       <w>77</w>
       <h>63</h>
     </coordinates>
@@ -540,8 +542,8 @@ bg=#c0ffb3</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>532</x>
-      <y>203</y>
+      <x>637</x>
+      <y>147</y>
       <w>266</w>
       <h>77</h>
     </coordinates>
@@ -558,8 +560,8 @@ bg=#fffeb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>798</x>
-      <y>91</y>
+      <x>903</x>
+      <y>35</y>
       <w>98</w>
       <h>28</h>
     </coordinates>
@@ -570,20 +572,20 @@ waypoints</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>784</x>
-      <y>350</y>
-      <w>126</w>
+      <x>889</x>
+      <y>294</y>
+      <w>196</w>
       <h>112</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;-
 waypoints</panel_attributes>
-    <additional_attributes>10.0;20.0;160.0;20.0;160.0;140.0</additional_attributes>
+    <additional_attributes>10.0;20.0;260.0;20.0;260.0;140.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>651</x>
-      <y>154</y>
+      <x>756</x>
+      <y>98</y>
       <w>98</w>
       <h>63</h>
     </coordinates>
@@ -596,8 +598,8 @@ waypoints</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>651</x>
-      <y>273</y>
+      <x>756</x>
+      <y>217</y>
       <w>98</w>
       <h>63</h>
     </coordinates>
@@ -610,8 +612,8 @@ waypoints</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>406</x>
-      <y>476</y>
+      <x>511</x>
+      <y>420</y>
       <w>175</w>
       <h>42</h>
     </coordinates>
@@ -625,8 +627,8 @@ bg=#fffeb3</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>483</x>
-      <y>511</y>
+      <x>588</x>
+      <y>455</y>
       <w>70</w>
       <h>63</h>
     </coordinates>
@@ -639,8 +641,8 @@ controlPoint
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>441</x>
-      <y>224</y>
+      <x>546</x>
+      <y>168</y>
       <w>147</w>
       <h>266</h>
     </coordinates>
@@ -657,8 +659,8 @@ controlPoint
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>455</x>
-      <y>56</y>
+      <x>560</x>
+      <y>0</y>
       <w>91</w>
       <h>28</h>
     </coordinates>
@@ -668,8 +670,8 @@ controlPoint
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>455</x>
-      <y>175</y>
+      <x>560</x>
+      <y>119</y>
       <w>91</w>
       <h>42</h>
     </coordinates>
@@ -679,8 +681,8 @@ controlPoint
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>448</x>
-      <y>294</y>
+      <x>553</x>
+      <y>238</y>
       <w>91</w>
       <h>42</h>
     </coordinates>
@@ -690,8 +692,8 @@ controlPoint
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>735</x>
-      <y>721</y>
+      <x>910</x>
+      <y>665</y>
       <w>161</w>
       <h>28</h>
     </coordinates>
@@ -702,18 +704,35 @@ effectiveProperties</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>651</x>
-      <y>672</y>
-      <w>182</w>
+      <x>910</x>
+      <y>616</y>
+      <w>147</w>
       <h>140</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;-
 
 
 
-  1
-markProperties
-  1</panel_attributes>
-    <additional_attributes>150.0;10.0;150.0;180.0;10.0;180.0</additional_attributes>
+
+
+
+
+ originatingMarkProperties
+</panel_attributes>
+    <additional_attributes>30.0;10.0;30.0;180.0;10.0;180.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>560</x>
+      <y>609</y>
+      <w>133</w>
+      <h>161</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+
+
+lastUsedTemplate</panel_attributes>
+    <additional_attributes>170.0;190.0;10.0;190.0;10.0;10.0</additional_attributes>
   </element>
 </diagram>