diff --git a/wiki/coursecreation/CourseCreation.png b/wiki/coursecreation/CourseCreation.png
new file mode 100644
index 00000000000..d8d41ccced6
Binary files /dev/null and b/wiki/coursecreation/CourseCreation.png differ
diff --git a/wiki/coursecreation/CourseCreation.uxf b/wiki/coursecreation/CourseCreation.uxf
new file mode 100644
index 00000000000..97960d8a90f
--- /dev/null
+++ b/wiki/coursecreation/CourseCreation.uxf
@@ -0,0 +1,700 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<diagram program="umlet" version="14.3.0">
+  <zoom_level>7</zoom_level>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>581</x>
+      <y>532</y>
+      <w>126</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>CommonMarkProperties
+--
+color : Color
+shape : String
+pattern : String
+type : MarkType
+shortName : String</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>385</x>
+      <y>651</y>
+      <w>105</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>MarkTemplate
+--
+bg=#fffeb3
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>756</x>
+      <y>462</y>
+      <w>175</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>Waypoint
+--
+controlPoint : ControlPoint
+marks: Iterable&lt;Mark&gt;
+passingInstruction: PassingInstruction
+fixedBearing : Bearing
+bg=#ffb3b3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>791</x>
+      <y>574</y>
+      <w>105</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>ControlPoint
+marks : Iterable&lt;Mark&gt;
+
+bg=#ffb3b3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>791</x>
+      <y>651</y>
+      <w>133</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>ControlPointWithTwoMarks
+--
+left: Mark
+right: Mark
+bg=#ffb3b3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>833</x>
+      <y>602</y>
+      <w>21</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>637</x>
+      <y>602</y>
+      <w>217</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>290.0;10.0;290.0;40.0;10.0;40.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>595</x>
+      <y>651</y>
+      <w>147</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>Mark
+--
+markTemplate : MarkTemplate
+bg=#ffb3b3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>637</x>
+      <y>602</y>
+      <w>21</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>735</x>
+      <y>658</y>
+      <w>70</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+2           1</panel_attributes>
+    <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>336</y>
+      <w>266</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>Course
+--
+waypoints : List&lt;Waypoint&gt;
+associatedRoles : BiMap&lt;Mark, String&gt;
+courseTemplate : CourseTemplate
+bg=#ffb3b3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>476</x>
+      <y>98</y>
+      <w>273</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>CourseConfiguration
+--
+waypoints : List&lt;WaypointWithMarkConfiguration&gt;
+associatedRoles : BiMap&lt;MarkConfiguration, String&gt;
+allMarks : Set&lt;MarkConfiguration&gt;
+loop : RepeatablePartDefinition
+courseTemplate : CourseTemplate
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLNote</id>
+    <coordinates>
+      <x>126</x>
+      <y>196</y>
+      <w>287</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>markTemplatesInCourse ⊆ markTemplates
+markTemplatesInCourse ≡ associatedRoles.keySet()
+-&gt; use default roles if no role had been defined
+RepeatablePartDefinition is based on markTemplatesInCourse
+bg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLNote</id>
+    <coordinates>
+      <x>126</x>
+      <y>77</y>
+      <w>287</w>
+      <h>49</h>
+    </coordinates>
+    <panel_attributes>allMarks ≡ associatedRoles.keySet()
+∀ MarkConfig m  ⊆ waypoints : m ∈ allMarks
+bg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLNote</id>
+    <coordinates>
+      <x>119</x>
+      <y>315</y>
+      <w>287</w>
+      <h>84</h>
+    </coordinates>
+    <panel_attributes>associatedRoles.keySet() ≡ markTemplatesInCourse
+-&gt; associated roles are optional
+the courseTemplate can be null if
+- a mark is added that was not in the associated CourseTemplate
+- a courseTemplate was never associated (legacy)
+- the associated courseTemplate was never saved
+bg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>826</x>
+      <y>231</y>
+      <w>329</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>ControlPointWithMarkConfiguration
+--
+markConfigurations : Iterable&lt;MarkConfiguration&gt;
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>357</x>
+      <y>574</y>
+      <w>154</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>ControlPointTemplate
+--
+marks : Iterable&lt;MarkTemplate&gt;
+bg=#fffeb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>427</x>
+      <y>602</y>
+      <w>21</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>434</x>
+      <y>602</y>
+      <w>189</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>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>217</x>
+      <y>651</y>
+      <w>105</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>MarkPairTemplate
+--
+left : MarkTemplate
+right: MarkTemplate
+bg=#fffeb3
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>315</x>
+      <y>658</y>
+      <w>84</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>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>252</x>
+      <y>602</y>
+      <w>196</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>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>826</x>
+      <y>721</y>
+      <w>329</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>MarkConfiguration
+--
+optionalMarkTemplate : MarkTemplate
+effectiveProperties: CommonMarkPropertiesWithOptionalPositioning
+storeToInventory: boolean
+
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>973</x>
+      <y>266</y>
+      <w>21</w>
+      <h>469</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;650.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>525</x>
+      <y>882</y>
+      <w>329</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>FreestlyeMarkConfiguration
+--
+freestyleProperties : CommonMarkPropertiesWithOptionalPositioning
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>875</x>
+      <y>882</y>
+      <w>154</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>RegattaMarkConfiguration
+--
+mark : Mark
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>742</x>
+      <y>931</y>
+      <w>329</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>MarkPropertiesBasedMarkConfiguration
+--
+markProperties : MarkProperties
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1064</x>
+      <y>882</y>
+      <w>203</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>MarkTemplateBasedMarkConfiguration
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>945</x>
+      <y>770</y>
+      <w>112</w>
+      <h>126</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>140.0;10.0;140.0;140.0;10.0;140.0;10.0;160.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1036</x>
+      <y>770</y>
+      <w>21</w>
+      <h>175</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;230.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1036</x>
+      <y>770</y>
+      <w>126</w>
+      <h>126</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;140.0;160.0;140.0;160.0;160.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>665</x>
+      <y>770</y>
+      <w>392</w>
+      <h>126</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>540.0;10.0;540.0;140.0;10.0;140.0;10.0;160.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>448</x>
+      <y>714</y>
+      <w>238</w>
+      <h>49</h>
+    </coordinates>
+    <panel_attributes>CommonMarkPropertiesWithOptionalPositioning
+--
+deviceIdentifier : DeviceIdentivier
+fixedPosition : FixedPosition
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>553</x>
+      <y>602</y>
+      <w>70</w>
+      <h>126</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>80.0;10.0;80.0;50.0;10.0;50.0;10.0;160.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>518</x>
+      <y>791</y>
+      <w>84</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>MarkProperties
+--
+bg=#b3deff</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>553</x>
+      <y>756</y>
+      <w>21</w>
+      <h>49</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;50.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>483</x>
+      <y>658</y>
+      <w>126</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>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>826</x>
+      <y>105</y>
+      <w>238</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>WaypointWithMarkConfiguration
+--
+controlPoint : ControlPointWithMarkConfiguration
+passingInstruction: PassingInstruction
+bg=#c0ffb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>938</x>
+      <y>168</y>
+      <w>77</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+1              1
+  controlPoint</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;90.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>833</x>
+      <y>525</y>
+      <w>77</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+  1
+ controlPoint
+  1</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>476</x>
+      <y>217</y>
+      <w>266</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>Course Template
+--
+waypointTemplates : List&lt;WaypointTemplate&gt;
+associatedRoles : BiMap&lt;MarkTemplate, String&gt;
+markTemplates : Set&lt;MarkTemplate&gt;
+markTemplatesInCourse : List&lt;MarkTemplate&gt;
+loop : RepeatablePartDefinition
+bg=#fffeb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>742</x>
+      <y>105</y>
+      <w>98</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+waypoints</panel_attributes>
+    <additional_attributes>10.0;20.0;120.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>728</x>
+      <y>364</y>
+      <w>126</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>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>595</x>
+      <y>168</y>
+      <w>98</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+   1
+  courseTemplate
+   1</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>595</x>
+      <y>287</y>
+      <w>98</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+   1
+  courseTemplate
+   1</panel_attributes>
+    <additional_attributes>10.0;70.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>350</x>
+      <y>490</y>
+      <w>175</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>WaypointTemplate
+--
+controlPoint : ControlPointTemplate
+passingInstruction : PassingInstruction
+bg=#fffeb3</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>427</x>
+      <y>525</y>
+      <w>70</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+ 1
+controlPoint
+ 1</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>385</x>
+      <y>238</y>
+      <w>147</w>
+      <h>266</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+
+
+
+
+
+
+                   waypointTemplates</panel_attributes>
+    <additional_attributes>130.0;20.0;70.0;20.0;70.0;360.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>399</x>
+      <y>70</y>
+      <w>91</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>lt=.</panel_attributes>
+    <additional_attributes>10.0;10.0;110.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>399</x>
+      <y>189</y>
+      <w>91</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>lt=.</panel_attributes>
+    <additional_attributes>10.0;10.0;110.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>392</x>
+      <y>308</y>
+      <w>91</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>lt=.</panel_attributes>
+    <additional_attributes>10.0;10.0;110.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>679</x>
+      <y>735</y>
+      <w>161</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;&lt;&lt;-
+effectiveProperties</panel_attributes>
+    <additional_attributes>210.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+</diagram>