Grammar update (intermediate state; not working)

org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext

@@ -383,24 +383,62 @@ Stakeholder:
 
 ValueRegister:
 	"ValueRegister" name=ID "for" context=[BoundedContext] (OPEN
-		values+=ValueCluster*
+		valueClusters+=ValueCluster*
+		values+=Value*
 	CLOSE)
 ;
 
 ValueCluster:
+	"ValueCluster" name=ID (OPEN
+		"core" ("=")? coreValue=CoreValue
+		(("demonstrator" ("=")?)? demonstrators+=STRING)*
+		values+=Value
+		elicitations+=ValueElicitation* // needed on this level?
+	CLOSE)
+;
+
+Value:
 	"Value" name=ID (OPEN
-		("core" ("=")? coreValue=CoreValue )?
-		(("demonstrator" ("=")?)? demonstrator=STRING)?
-
+		(("demonstrator" ("=")?)? demonstrators+=STRING)*
 		elicitations+=ValueElicitation*
 	CLOSE)
 ;
 
 ValueElicitation:
-	'Stakeholder' stakeholder=[Stakeholder]
-	'Priority' priority=PRIORITY? 
-	'Impact' impact=IMPACT? 
-	'Consequences' consequences+=Consequence* 
+	'Stakeholder' stakeholder=[Stakeholder] (OPEN
+		'Priority' priority=PRIORITY? 
+		'Impact' impact=IMPACT? 
+		'Consequences' consequences+=Consequence* 
+	CLOSE)
+;
+
+ValueDemonstrator:
+	ValueEpic | ValueNarrative | ValueWeigthing | STRING
+;
+
+ValueEpic: (OPEN
+    "As a" stakeholder=STRING "I value" coreValue=CoreValue "as demonstrated in" // TODO: stakeholder and value actually already defined upwards in hierarchy 
+    ("a realization of" realizedLevel1Values+=STRING)+
+    ("a reduction of" reducedLevel1Values+=STRING)+   
+	CLOSE)
+;
+
+ValueNarrative: (OPEN
+	"When the SOI executes" feature=STRING ","
+    "stakeholders expect it to promote, protect or create" promotedValues=STRING ','
+    "possibly degrading or prohibiting" harmedValues=STRING 
+    "with the following externally observable and/or internally auditable behavior:" preAndPostConditions=STRING
+	CLOSE)
+;
+
+// Q: ValueDemonstrator vs. ValueElicitation ? contains overlapping information ... (stakeholder, priorities, benefits and harms are not same as consequences?)
+
+ValueWeigthing: (OPEN
+	"In the context of SOI" system=STRING ',' // TODO: system already defined above (BC)
+    "stakeholder" stakeholder=STRING "values" value1=STRING "more than" value2=STRING // TODO references
+    "expecting benefits such as" benefits=STRING 
+    "running the risk of harms such as" harms=STRING 
+	CLOSE)
 ;
 
 Consequence: