diff --git a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st
index a45a37c..bc91666 100644
--- a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st
+++ b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st
@@ -7,6 +7,6 @@ abilitiesAsWikiTextFor: abilitiesSubset marked: unicodeSymbol
 		aStream 
 			nextPutAll: '  <li> ', unicodeSymbol ; cr;
 			nextPutAll: '    ';
-			nextPutAll: ((WikiText new content: abi) convertMarkdownLinks); cr;
+			nextPutAll: abi; cr;
 			nextPutAll: '  </li>'; cr ].
 	^ aStream contents
\ No newline at end of file
diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
index a8ba71f..f6cbcd5 100644
--- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
+++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
@@ -1,3 +1,7 @@
 accessing
 asJsonTiddler
-	^ self asTiddler asJson 
\ No newline at end of file
+<<<<<<< HEAD
+	^ self asTiddler asJson
+=======
+	^ self asTiddler asJson 
+>>>>>>> master
diff --git a/RoloLudo.package/SfAsset.class/instance/asTiddler.st b/RoloLudo.package/SfAsset.class/instance/asTiddler.st
index 55fdd48..998a205 100644
--- a/RoloLudo.package/SfAsset.class/instance/asTiddler.st
+++ b/RoloLudo.package/SfAsset.class/instance/asTiddler.st
@@ -3,4 +3,5 @@ asTiddler
 	^ Tiddler new
 		title: self name;
 		tags: 'Starforged ' , self category;
-		text: self abilitiesAsWikiText
\ No newline at end of file
+		text: self abilitiesAsWikiText;
+		created: DateAndTime now asString.
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/README.md b/RoloLudo.package/SfMove.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/RoloLudo.package/SfMove.class/instance/asTiddler.st b/RoloLudo.package/SfMove.class/instance/asTiddler.st
new file mode 100644
index 0000000..069c24b
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/asTiddler.st
@@ -0,0 +1,7 @@
+accessing
+asTiddler
+	^ Tiddler new
+		title: self name;
+		tags: 'Starforged ' ,'[[', self category,']]';
+		text: self text;
+		created: DateAndTime now asString.
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/category.st b/RoloLudo.package/SfMove.class/instance/category.st
new file mode 100644
index 0000000..04be151
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/category.st
@@ -0,0 +1,3 @@
+accessing
+category
+	^ category
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/fromDictionary..st b/RoloLudo.package/SfMove.class/instance/fromDictionary..st
new file mode 100644
index 0000000..12a8358
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/fromDictionary..st
@@ -0,0 +1,8 @@
+accessing
+fromDictionary: aDictionary
+	| tempText |
+	tempText := (WikiText new content: (aDictionary at: 'Text')) convertMarkdownBold; convertMarkdownLinks. 
+	category := aDictionary at: 'Category'.
+	name := aDictionary at: 'Name'.
+	text := tempText content.
+	(aDictionary includesKey: 'Progress Move') ifTrue: [ self progress: true ]
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/name.st b/RoloLudo.package/SfMove.class/instance/name.st
new file mode 100644
index 0000000..22077c2
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/name.st
@@ -0,0 +1,3 @@
+accessing
+name
+	^ name
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/printOn..st b/RoloLudo.package/SfMove.class/instance/printOn..st
new file mode 100644
index 0000000..98b1759
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/printOn..st
@@ -0,0 +1,4 @@
+accessing
+printOn: aStream
+	super printOn: aStream.
+	aStream nextPutAll: '( ', self name, ' ) '.
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/progress..st b/RoloLudo.package/SfMove.class/instance/progress..st
new file mode 100644
index 0000000..158f7cc
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/progress..st
@@ -0,0 +1,3 @@
+accessing
+progress: aBoolean
+	progress := aBoolean
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/progress.st b/RoloLudo.package/SfMove.class/instance/progress.st
new file mode 100644
index 0000000..bbe947a
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/progress.st
@@ -0,0 +1,3 @@
+accessing
+progress
+	^ progress
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/instance/text.st b/RoloLudo.package/SfMove.class/instance/text.st
new file mode 100644
index 0000000..3251dea
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/instance/text.st
@@ -0,0 +1,3 @@
+accessing
+text
+	^ text
\ No newline at end of file
diff --git a/RoloLudo.package/SfMove.class/properties.json b/RoloLudo.package/SfMove.class/properties.json
new file mode 100644
index 0000000..7a55555
--- /dev/null
+++ b/RoloLudo.package/SfMove.class/properties.json
@@ -0,0 +1,16 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "RoloLudo",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"category",
+		"name",
+		"text",
+		"progress"
+	],
+	"name" : "SfMove",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/README.md b/RoloLudo.package/SfOracle.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/RoloLudo.package/SfOracle.class/instance/asTiddler.st b/RoloLudo.package/SfOracle.class/instance/asTiddler.st
new file mode 100644
index 0000000..14777ce
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/asTiddler.st
@@ -0,0 +1,7 @@
+accessing
+asTiddler
+	^ Tiddler new
+		title: self name;
+		tags: 'Starforged';
+		text: self intro, String lf, String lf, self optionsWikiTextTable;
+		created: DateAndTime now asString.
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/fromDictionary..st b/RoloLudo.package/SfOracle.class/instance/fromDictionary..st
new file mode 100644
index 0000000..6ee54c1
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/fromDictionary..st
@@ -0,0 +1,15 @@
+accessing
+fromDictionary: aDictionary
+	| optionsTable |
+	name := aDictionary at: 'Name'.
+	optionsTable := aDictionary at: 'Table'.
+	optionsTable doWithIndex: [:opt :i | | key value prevKey | 
+		(i = 1) 
+			ifTrue: [key := 1 to: (opt at: 'Chance') asInteger]
+			ifFalse: [
+				prevKey := ((optionsTable at: (i-1)) at: 'Chance').
+				key := (prevKey asInteger + 1) to: (opt at: 'Chance') asInteger.
+			].
+		value := (opt at: 'Description') capitalized.
+		self options at: key put: value .
+	].
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/intro..st b/RoloLudo.package/SfOracle.class/instance/intro..st
new file mode 100644
index 0000000..aa47ada
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/intro..st
@@ -0,0 +1,3 @@
+accessing
+intro: longerText
+	intro := longerText 
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/intro.st b/RoloLudo.package/SfOracle.class/instance/intro.st
new file mode 100644
index 0000000..4088955
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/intro.st
@@ -0,0 +1,3 @@
+accessing
+intro
+	^ intro
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/name..st b/RoloLudo.package/SfOracle.class/instance/name..st
new file mode 100644
index 0000000..89ffdc1
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/name..st
@@ -0,0 +1,3 @@
+accessing
+name: shortText
+	name := shortText
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/name.st b/RoloLudo.package/SfOracle.class/instance/name.st
new file mode 100644
index 0000000..40a2166
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/name.st
@@ -0,0 +1,3 @@
+accessing
+name
+ ^ name
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/options..st b/RoloLudo.package/SfOracle.class/instance/options..st
new file mode 100644
index 0000000..d822cff
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/options..st
@@ -0,0 +1,3 @@
+accessing
+options: anOrderedDictionary
+	options := anOrderedDictionary
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/options.st b/RoloLudo.package/SfOracle.class/instance/options.st
new file mode 100644
index 0000000..55a9f18
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/options.st
@@ -0,0 +1,3 @@
+accessing
+options
+	^ options ifNil: [ options := OrderedDictionary new ]
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st b/RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st
new file mode 100644
index 0000000..d55cc07
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st
@@ -0,0 +1,10 @@
+accessing
+optionsWikiTextTable
+	| output |
+	output := '' writeStream.
+	self options keysAndValuesDo: [:k :v |
+		output
+			nextPutAll: '| ', k first asString, ' - ', k last asString, ' |';
+			nextPutAll: v, ' |'; cr
+	].
+	^ output contents
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/printOn..st b/RoloLudo.package/SfOracle.class/instance/printOn..st
new file mode 100644
index 0000000..9d8e44b
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/printOn..st
@@ -0,0 +1,5 @@
+accessing
+printOn: aStream
+	super printOn: aStream.
+	aStream
+		nextPutAll: '( ', self name, ' )'.
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/instance/roll.st b/RoloLudo.package/SfOracle.class/instance/roll.st
new file mode 100644
index 0000000..d83c11c
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/instance/roll.st
@@ -0,0 +1,7 @@
+accessing
+roll
+	| diceRoll |
+	diceRoll := 100 atRandom.
+	self options keysAndValuesDo: [:k :v |
+		(k includes: diceRoll) ifTrue: [ ^ v ]
+	]
\ No newline at end of file
diff --git a/RoloLudo.package/SfOracle.class/properties.json b/RoloLudo.package/SfOracle.class/properties.json
new file mode 100644
index 0000000..ebffca7
--- /dev/null
+++ b/RoloLudo.package/SfOracle.class/properties.json
@@ -0,0 +1,15 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "RoloLudo-RoloLudo",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"name",
+		"intro",
+		"options"
+	],
+	"name" : "SfOracle",
+	"type" : "normal"
+}
\ No newline at end of file