diff --git a/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js
index d339a10e8..2e5803fa6 100644
--- a/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js
+++ b/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js
@@ -179,6 +179,12 @@ function newProtocolNode() {
             }
         }
 
+        if (node.payload.tutorial !== undefined) {
+            savedPayload.tutorial = {
+                status: node.payload.tutorial.status
+            }
+        }
+
         if (includeReferencesInSavedPayload) {
             /* Next for the ones that have a reference parent, we include it */
             if (node.payload.referenceParent !== undefined) {
diff --git a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
index f76a584d9..cc7b25ab2 100644
--- a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
+++ b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
@@ -576,6 +576,12 @@ function newUiObjectsFromNodes() {
                 frame.radius = node.savedPayload.frame.radius
                 saveFrame(payload, frame)
             }
+            if (node.savedPayload.tutorial !== undefined) {
+                let tutorial = {
+                    status: node.savedPayload.tutorial.status
+                }
+                saveTutorial(payload, tutorial)
+            }
         }
 
         /* Now we mount the floating object where the UIOBject will be laying on top of */
diff --git a/Spaces/TutorialSpace.js b/Spaces/TutorialSpace.js
index a87e4b96a..163b7f16b 100644
--- a/Spaces/TutorialSpace.js
+++ b/Spaces/TutorialSpace.js
@@ -10,8 +10,6 @@ function newTutorialSpace() {
         resumeTutorialTopic: resumeTutorialTopic,
         playTutorialStep: playTutorialStep,
         resumeTutorialStep: resumeTutorialStep,
-        tutorialTopicDone: tutorialTopicDone,
-        tutorialStepDone: tutorialStepDone,
         resetTutorialProgress: resetTutorialProgress,
         container: undefined,
         physics: physics,
@@ -48,6 +46,7 @@ function newTutorialSpace() {
     let newConfig
     let newDocumentationURL
     let currentDocumentationURL
+    let resumeModeActivated // In this mode, we skip all the node which status is 'Done'
 
     return thisObject
 
@@ -240,10 +239,15 @@ function newTutorialSpace() {
         tutorialRootNode = node
         currentNode = node
         currentStatus = 'Playing Tutorial'
+        resumeModeActivated = false
     }
 
     function resumeTutorial(node) {
-
+        tutorialRootNode = node
+        currentNode = node
+        currentStatus = 'Playing Tutorial'
+        resumeModeActivated = true
+        advance()
     }
 
     function stop() {
@@ -252,11 +256,18 @@ function newTutorialSpace() {
     }
 
     function skip() {
-
+        let tutorial = {
+            status:'Skipped'
+        }
+        saveTutorial(currentNode.payload, tutorial)
+        advance()
     }
 
     function done() {
-        /* If we are standing at the Tutorial Node, we do this. */
+        let tutorial = {
+            status:'Done'
+        }
+        saveTutorial(currentNode.payload, tutorial)
         advance()
     }
 
@@ -264,34 +275,56 @@ function newTutorialSpace() {
         currentTopicNode = node
         currentNode = node
         currentStatus = 'Playing Topic'
+        resumeModeActivated = false
         findTutorialNode(node)
     }
 
     function resumeTutorialTopic(node) {
-
+        currentTopicNode = node
+        currentNode = node
+        currentStatus = 'Playing Topic'
+        resumeModeActivated = true
+        findTutorialNode(node)
     }
 
     function playTutorialStep(node) {
         currentStepNode = node
         currentNode = node
         currentStatus = 'Playing Step'
+        resumeModeActivated = false
         findTutorialNode(node)
     }
 
     function resumeTutorialStep(node) {
-
+        currentStepNode = node
+        currentNode = node
+        currentStatus = 'Playing Step'
+        resumeModeActivated = true
+        findTutorialNode(node)
     }
 
-    function tutorialTopicDone() {
+    function resetTutorialProgress(node) {
+        resetNextNode(node)
 
-    }
+        function resetNextNode(node) {
 
-    function tutorialStepDone() {
-
-    }
-
-    function resetTutorialProgress() {
+            for (let i = 0; i < node.tutorialSteps.length; i++) {
+                let tutorialStep = node.tutorialSteps[i]
+                let tutorial = {
+                    status:'Reset'
+                }
+                saveTutorial(tutorialStep.payload, tutorial)
+            }
 
+            for (let i = 0; i < node.tutorialTopics.length; i++) {
+                let tutorialTopic = node.tutorialTopics[i]
+                let tutorial = {
+                    status:'Reset'
+                }
+                saveTutorial(tutorialTopic.payload, tutorial)
+                resetNextNode(tutorialTopic)
+            }
+        }
     }
 
     function findTutorialNode(node) {
@@ -354,10 +387,23 @@ function newTutorialSpace() {
 
                 let tutorialStep = node.tutorialSteps[i]
                 if (found === true) {
-                    currentNode = tutorialStep
-                    currentStatus = 'Playing Step'
-                    advanced = true
-                    return
+                    if (resumeModeActivated !== true) {
+                        currentNode = tutorialStep
+                        currentStatus = 'Playing Step'
+                        advanced = true
+                        return
+                    } else {
+                        let tutorial = {
+                            status: undefined
+                        }
+                        loadTutorial(tutorialStep.payload, tutorial)
+                        if (tutorial.status !== 'Done') {
+                            currentNode = tutorialStep
+                            currentStatus = 'Playing Step'
+                            advanced = true
+                            return
+                        }
+                    }
                 }
                 if (tutorialStep.id === currentNode.id) {
                     found = true
@@ -372,10 +418,23 @@ function newTutorialSpace() {
 
                 let tutorialTopic = node.tutorialTopics[i]
                 if (found === true) {
-                    currentNode = tutorialTopic
-                    currentStatus = 'Playing Topic'
-                    advanced = true
-                    return
+                    if (resumeModeActivated !== true) {
+                        currentNode = tutorialTopic
+                        currentStatus = 'Playing Topic'
+                        advanced = true
+                        return
+                    } else {
+                        let tutorial = {
+                            status: undefined
+                        }
+                        loadTutorial(tutorialTopic.payload, tutorial)
+                        if (tutorial.status !== 'Done') {
+                            currentNode = tutorialTopic
+                            currentStatus = 'Playing Topic'
+                            advanced = true
+                            return
+                        }
+                    }
                 }
                 if (tutorialTopic.id === currentNode.id) {
                     found = true
diff --git a/Utilities/LoadSaveTutorial.js b/Utilities/LoadSaveTutorial.js
new file mode 100644
index 000000000..402a3ddf0
--- /dev/null
+++ b/Utilities/LoadSaveTutorial.js
@@ -0,0 +1,18 @@
+function saveTutorial(payload, tutorial) {
+    payload.tutorial = {
+        status: tutorial.status
+    }
+}
+
+function loadTutorial(payload, tutorial) {
+    if (payload.tutorial !== undefined) {
+        tutorial.status = payload.tutorial.status
+        return
+    }
+    if (payload.node.savedPayload !== undefined) {
+        if (payload.node.savedPayload.tutorial !== undefined) {
+            tutorial.status = payload.node.savedPayload.tutorial.status
+            payload.node.savedPayload.tutorial = undefined
+        }
+    }
+}