Resolve WES-133 "Multiple choice"

2023-04-10 15:05:11 +00:00
parent 04d9a4bf2b
commit 4e9d801e61
49 changed files with 3310 additions and 1244 deletions
--- a/Assets/Accounts/Scenes/ChangeUserScreen.unity
+++ b/Assets/Accounts/Scenes/ChangeUserScreen.unity
@@ -755,10 +755,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/StartScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -793,11 +789,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -1920,7 +1916,6 @@ MonoBehaviour:
  userPrefab: {fileID: 7566391564300576383, guid: f5103a1b6ba1b0445a0d049203b9b6b2, type: 3}
  usersContainer: {fileID: 1438010722}
  error: {fileID: 1815188481}
-  userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
 --- !u!4 &2129020787
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/Accounts/Scenes/UserProgressScreen.unity
+++ b/Assets/Accounts/Scenes/UserProgressScreen.unity
@@ -516,7 +516,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a59f8e8c48fbd4444a41df01694d13a7, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
  username: {fileID: 1021209698}
  avatar: {fileID: 1873954004}
  playtime: {fileID: 1716832605}
@@ -904,10 +903,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/StartScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -942,11 +937,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Accounts/Scripts/User.cs
+++ b/Assets/Accounts/Scripts/User.cs
@@ -113,6 +113,15 @@ public class User
        storedUserData.courses.Add(progress);
    }

+    /// <summary>
+    /// Reset progress of a course
+    /// </summary>
+    /// <param name="courseIndex">Index of course</param>
+    public void ResetCourseProgress(CourseIndex courseIndex)
+    {
+        storedUserData.courses.RemoveAll((p) => p.courseIndex == courseIndex);
+    }
+
    /// <summary>
    /// Get the progress of all minigames the user did
    /// </summary>
@@ -140,4 +149,13 @@ public class User
    {
        storedUserData.minigames.Add(progress);
    }
+
+    /// <summary>
+    /// Reset progress of a minigame
+    /// </summary>
+    /// <param name="minigameIndex">Index of the minigame</param>
+    public void ResetMinigameProgress(MinigameIndex minigameIndex)
+    {
+        storedUserData.minigames.RemoveAll((p) => p.minigameIndex == minigameIndex);
+    }
 }
--- a/Assets/Accounts/Tests/UserTest.cs
+++ b/Assets/Accounts/Tests/UserTest.cs
@@ -139,6 +139,20 @@ public class UserTest
        Assert.AreEqual(q.progress, 3.14159265f);
    }

+    /// <summary>
+    /// Test progress of a course is correctly reset (aka removed)
+    /// </summary>
+    [Test]
+    public void Test_User_ResetCourseProgres()
+    {
+        var p = new PersistentDataController.SavedCourseProgress();
+        p.courseIndex = CourseIndex.FINGERSPELLING;
+        user.AddCourseProgress(p);
+        Assert.IsNotNull(user.GetCourseProgress(CourseIndex.FINGERSPELLING));
+        user.ResetCourseProgress(CourseIndex.FINGERSPELLING);
+        Assert.IsNull(user.GetCourseProgress(CourseIndex.FINGERSPELLING));
+    }
+
    /// <summary>
    /// Test GetMinigameProgress returns null when minigame cannot be found
    /// </summary>
@@ -168,4 +182,18 @@ public class UserTest
        Assert.Zero(q.latestScores.Count);
        Assert.Zero(q.highestScores.Count);
    }
+
+    /// <summary>
+    /// Test progress of a minigame is correctly reset (aka removed)
+    /// </summary>
+    [Test]
+    public void Test_User_ResetMinigameProgres()
+    {
+        var p = new PersistentDataController.SavedMinigameProgress();
+        p.minigameIndex = MinigameIndex.SPELLING_BEE;
+        user.AddMinigameProgress(p);
+        Assert.IsNotNull(user.GetMinigameProgress(MinigameIndex.SPELLING_BEE));
+        user.ResetMinigameProgress(MinigameIndex.SPELLING_BEE);
+        Assert.IsNull(user.GetMinigameProgress(MinigameIndex.SPELLING_BEE));
+    }
 }
--- a/Assets/Common/Fonts/Korolev
+++ b/Assets/Common/Fonts/Korolev
--- a/Assets/Common/Images/Menus/Progressbar.png.meta
+++ b/Assets/Common/Images/Menus/Progressbar.png.meta
@@ -48,7 +48,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 20, y: 7, z: 20, w: 7}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
@@ -113,6 +113,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@@ -120,7 +132,7 @@ TextureImporter:
    physicsShape: []
    bones: []
    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
    vertices: []
    indices: 
    edges: []
--- a/Assets/Common/Images/Menus/ProgressbarEmpty.png.meta
+++ b/Assets/Common/Images/Menus/ProgressbarEmpty.png.meta
@@ -48,7 +48,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 20, y: 7, z: 20, w: 7}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
@@ -113,6 +113,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@@ -120,7 +132,7 @@ TextureImporter:
    physicsShape: []
    bones: []
    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
    vertices: []
    indices: 
    edges: []
--- a/Assets/Common/Images/Menus/Rounded40px.png
+++ b/Assets/Common/Images/Menus/Rounded40px.png
--- a/Assets/Common/Images/Menus/Rounded40px.png.meta
+++ b/Assets/Common/Images/Menus/Rounded40px.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: deac5438096d5f64bbdf6b1934ef230e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 37, y: 37, z: 37, w: 37}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Common/Images/Menus/pause
+++ b/Assets/Common/Images/Menus/pause
--- a/Assets/Common/Images/Menus/pause
+++ b/Assets/Common/Images/Menus/pause
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: e9d7c25ce4800b840a37d69d5b876671
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Common/Images/Menus/play
+++ b/Assets/Common/Images/Menus/play
--- a/Assets/Common/Images/Menus/play
+++ b/Assets/Common/Images/Menus/play
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 05a683651206b994fa7921be6d84dddf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Common/Images/Menus/reload.png
+++ b/Assets/Common/Images/Menus/reload.png
--- a/Assets/Common/Images/Menus/reload.png.meta
+++ b/Assets/Common/Images/Menus/reload.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: c503be644b0f16f43beb5cd454225ad1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Common/Prefabs/ButtonBack.prefab
+++ b/Assets/Common/Prefabs/ButtonBack.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &5761786982148492470
+--- !u!1 &8299246693487308514
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -8,51 +8,53 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 706427301931370686}
-  - component: {fileID: 540932024020377973}
-  - component: {fileID: 3974596401253687357}
+  - component: {fileID: 8299246693487308515}
+  - component: {fileID: 8299246693487308518}
+  - component: {fileID: 54433152227066563}
+  - component: {fileID: 8299246693487308512}
+  - component: {fileID: 4518652150503380115}
  m_Layer: 5
-  m_Name: Image
+  m_Name: ButtonBack
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &706427301931370686
+--- !u!224 &8299246693487308515
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5761786982148492470}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 8299246693487308514}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 8299246693487308515}
+  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -80, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &540932024020377973
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 300, y: 120}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &8299246693487308518
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5761786982148492470}
+  m_GameObject: {fileID: 8299246693487308514}
  m_CullTransparentMesh: 1
--- !u!114 &3974596401253687357
+--- !u!114 &54433152227066563
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5761786982148492470}
+  m_GameObject: {fileID: 8299246693487308514}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -76,54 +78,6 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &8299246693487308514
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8299246693487308515}
-  - component: {fileID: 8299246693487308518}
-  - component: {fileID: 8299246693487308512}
-  - component: {fileID: 4518652150503380115}
-  m_Layer: 5
-  m_Name: ButtonBack
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &8299246693487308515
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8299246693487308514}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 706427301931370686}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 300, y: 120}
-  m_Pivot: {x: 0, y: 1}
--- !u!222 &8299246693487308518
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8299246693487308514}
-  m_CullTransparentMesh: 1
 --- !u!114 &8299246693487308512
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Common/Scenes/CourseActivityScreen.unity
+++ b/Assets/Common/Scenes/CourseActivityScreen.unity
--- a/Assets/Common/Scenes/CoursesMenuScreen.unity
+++ b/Assets/Common/Scenes/CoursesMenuScreen.unity
@@ -1755,11 +1755,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scenes/ListCoursesScreen.unity
+++ b/Assets/Common/Scenes/ListCoursesScreen.unity
@@ -1418,10 +1418,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/CoursesScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -1456,11 +1452,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scenes/ListMinigamesScreen.unity
+++ b/Assets/Common/Scenes/ListMinigamesScreen.unity
@@ -1619,7 +1619,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 0.39215687}
+  m_Color: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -1651,10 +1651,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 1380805077}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/StartScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -1689,11 +1685,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scenes/MinigameActivityScreen.unity
+++ b/Assets/Common/Scenes/MinigameActivityScreen.unity
@@ -1234,10 +1234,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/ListMinigamesScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -1272,11 +1268,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scenes/SettingsScreen.unity
+++ b/Assets/Common/Scenes/SettingsScreen.unity
@@ -282,10 +282,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/StartScreen
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -320,11 +316,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scenes/ThemeSelectionScreen.unity
+++ b/Assets/Common/Scenes/ThemeSelectionScreen.unity
@@ -198,10 +198,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/InfoMinigame
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -236,11 +232,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Common/Scripts/CourseActivityScreen.cs
+++ b/Assets/Common/Scripts/CourseActivityScreen.cs
@@ -12,6 +12,7 @@ public class CourseActivityScreen : MonoBehaviour
    public GameObject previewButton;
    // ^^^ TEMPORARY STUFF ^^^

+    public GameObject restartButton;
    /// <summary>
    /// Reference to the courses
    /// </summary>
@@ -42,6 +43,16 @@ public class CourseActivityScreen : MonoBehaviour
    /// </summary>
    public Slider progressBar;

+    /// <summary>
+    /// Reference to the progressBar gameObject
+    /// </summary>
+    public GameObject progressObject;
+
+    /// <summary>
+    /// Reference to the 'completed' gameObject
+    /// </summary>
+    public GameObject completedObject;
+
    /// <summary>
    /// Sets the infopage for a given course
    /// </summary>
@@ -63,10 +74,42 @@ public class CourseActivityScreen : MonoBehaviour
        // Set progress
        PersistentDataController.GetInstance().Load();
        progress = UserList.GetCurrentUser().GetCourseProgress(course.index);
-        if (progress != null)
+        if (progress != null && course.theme.modelIndex != ModelIndex.NONE)
+        {
            progressBar.value = progress.progress;
+            if (progress.progress == 1.0f)
+            {
+                playButton.SetActive(false);
+                progressObject.SetActive(false);
+                completedObject.SetActive(true);
+            }
+            if (progress.inUseLearnables > 0)
+            {
+                restartButton.SetActive(true);
+                playButton.transform.Find("Button Text").GetComponent<TMP_Text>().text = "Verder";
+            }
+            else
+            {
+                restartButton.SetActive(false);
+            }
+        }
        else
+        {
            progressBar.value = 0.0f;
+            restartButton.SetActive(false);
+            playButton.transform.Find("Button Text").GetComponent<TMP_Text>().text = "Begin";
+        }
+    }
+
+    /// <summary>
+    /// Callback to reset and start the course
+    /// </summary>
+    public void ResetCourseProgress()
+    {
+        UserList.GetCurrentUser().ResetCourseProgress(progress.courseIndex);
+        UserList.Save();
+        progressBar.value = 0.0f;
+        StartCourse();
    }

    /// <summary>
--- a/Assets/Courses/Animations/PanelAtRest.anim
+++ b/Assets/Courses/Animations/PanelAtRest.anim
@@ -0,0 +1,98 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PanelAtRest
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/Courses/Animations/PanelAtRest.anim.meta
+++ b/Assets/Courses/Animations/PanelAtRest.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0a3de39ab7b53741b4cc9b514f651d4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Courses/Animations/Sign
+++ b/Assets/Courses/Animations/Sign
@@ -1,17 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-5529081660363197715
+--- !u!1102 &-6762280829515909430
 AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Start
+  m_Name: PanelAtRest
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: 8343280574711475829}
+  - {fileID: 3972640238460552754}
+  - {fileID: 5011812139034206004}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -21,7 +22,33 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: 7400000, guid: b0a3de39ab7b53741b4cc9b514f651d4, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-5595631104847502785
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SlidePanelOut
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 01aa21a7da3008e499655335bd79647d, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@@ -34,10 +61,11 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: SlidePanel
+  m_Name: SlidePanelIn
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 5438550235036740166}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -62,7 +90,13 @@ AnimatorController:
  m_Name: Sign with Video and Image
  serializedVersion: 5
  m_AnimatorParameters:
-  - m_Name: Slide Panel
+  - m_Name: Slide Panel In
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: Slide Panel Out
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
@@ -81,6 +115,31 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+--- !u!1101 &3972640238460552754
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Slide Panel In
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1098571647962602430}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &4086587755769510042
 AnimatorStateMachine:
  serializedVersion: 6
@@ -92,21 +151,24 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -1098571647962602430}
-    m_Position: {x: -100, y: 120, z: 0}
+    m_Position: {x: -100, y: 70, z: 0}
  - serializedVersion: 1
-    m_State: {fileID: -5529081660363197715}
-    m_Position: {x: 150, y: 120, z: 0}
+    m_State: {fileID: -5595631104847502785}
+    m_Position: {x: -100, y: 250, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -6762280829515909430}
+    m_Position: {x: 150, y: 70, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 40, y: -10, z: 0}
  m_EntryPosition: {x: 170, y: 220, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -5529081660363197715}
--- !u!1101 &8343280574711475829
+  m_DefaultState: {fileID: -6762280829515909430}
+--- !u!1101 &5011812139034206004
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -115,17 +177,42 @@ AnimatorStateTransition:
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 1
-    m_ConditionEvent: Slide Panel
+    m_ConditionEvent: Slide Panel Out
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -1098571647962602430}
+  m_DstState: {fileID: -5595631104847502785}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
-  m_ExitTime: 0.75
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &5438550235036740166
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Slide Panel Out
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5595631104847502785}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
--- a/Assets/Courses/Animations/SlidePanelIn.anim
+++ b/Assets/Courses/Animations/SlidePanelIn.anim
@@ -6,7 +6,7 @@ AnimationClip:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: SlidePanel
+  m_Name: SlidePanelIn
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
@@ -45,34 +45,6 @@ AnimationClip:
    path: 
    classID: 224
    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.41666666
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_SizeDelta.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
  m_PPtrCurves: []
  m_SampleRate: 12
  m_WrapMode: 0
@@ -88,13 +60,6 @@ AnimationClip:
      typeID: 224
      customType: 28
      isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 1967290853
-      script: {fileID: 0}
-      typeID: 224
-      customType: 28
-      isPPtrCurve: 0
    pptrCurveMapping: []
  m_AnimationClipSettings:
    serializedVersion: 2
@@ -145,34 +110,6 @@ AnimationClip:
    path: 
    classID: 224
    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.41666666
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_SizeDelta.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
--- a/Assets/Courses/Animations/SlidePanelIn.anim.meta
+++ b/Assets/Courses/Animations/SlidePanelIn.anim.meta
--- a/Assets/Courses/Animations/SlidePanelOut.anim
+++ b/Assets/Courses/Animations/SlidePanelOut.anim
@@ -0,0 +1,116 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SlidePanelOut
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.41666666
+        value: -1920
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.41666666
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.41666666
+        value: -1920
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/Courses/Animations/SlidePanelOut.anim.meta
+++ b/Assets/Courses/Animations/SlidePanelOut.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 01aa21a7da3008e499655335bd79647d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Courses/Prefabs/Choice
+++ b/Assets/Courses/Prefabs/Choice
@@ -0,0 +1,200 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5113510004904501784
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8754575466874197751}
+  - component: {fileID: 673816572445470689}
+  - component: {fileID: 7970930246351935795}
+  m_Layer: 5
+  m_Name: ImageOption
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8754575466874197751
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113510004904501784}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2971620926005579559}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &673816572445470689
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113510004904501784}
+  m_CullTransparentMesh: 1
+--- !u!114 &7970930246351935795
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113510004904501784}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6757870033260325101
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2971620926005579559}
+  - component: {fileID: 6432676832222266704}
+  - component: {fileID: 2847679918420822150}
+  - component: {fileID: 4998400628217915919}
+  m_Layer: 5
+  m_Name: Choice Fingerspelling
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2971620926005579559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6757870033260325101}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8754575466874197751}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -960, y: -540}
+  m_SizeDelta: {x: 250, y: 250}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6432676832222266704
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6757870033260325101}
+  m_CullTransparentMesh: 1
+--- !u!114 &2847679918420822150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6757870033260325101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4998400628217915919}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4998400628217915919
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6757870033260325101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: deac5438096d5f64bbdf6b1934ef230e, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1.5
--- a/Assets/Courses/Prefabs/Choice
+++ b/Assets/Courses/Prefabs/Choice
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3d0da629a7686e34cb645f9e375f1754
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Courses/Prefabs/Choice.prefab
+++ b/Assets/Courses/Prefabs/Choice.prefab
@@ -12,7 +12,7 @@ GameObject:
  - component: {fileID: 8993002675371337427}
  - component: {fileID: 4018761505178052810}
  m_Layer: 5
-  m_Name: Text (TMP)
+  m_Name: TextOption
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -33,10 +33,10 @@ RectTransform:
  m_Father: {fileID: 2971620926005579559}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 62.5, y: 0}
-  m_SizeDelta: {x: -125, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 55, y: 0}
+  m_SizeDelta: {x: -110, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8993002675371337427
 CanvasRenderer:
@@ -75,8 +75,8 @@ MonoBehaviour:
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4284235525
-  m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
+    rgba: 4294309365
+  m_fontColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -147,7 +147,7 @@ GameObject:
  - component: {fileID: 673816572445470689}
  - component: {fileID: 7970930246351935795}
  m_Layer: 5
-  m_Name: Image
+  m_Name: ImageOption
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -222,6 +222,7 @@ GameObject:
  - component: {fileID: 2971620926005579559}
  - component: {fileID: 6432676832222266704}
  - component: {fileID: 2847679918420822150}
+  - component: {fileID: 4998400628217915919}
  m_Layer: 5
  m_Name: Choice
  m_TagString: Untagged
@@ -246,10 +247,10 @@ RectTransform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -960, y: -540}
+  m_SizeDelta: {x: 500, y: 100}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6432676832222266704
 CanvasRenderer:
@@ -278,9 +279,9 @@ MonoBehaviour:
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_SelectOnRight: {fileID: 0}
-  m_Transition: 0
+  m_Transition: 1
  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -299,7 +300,37 @@ MonoBehaviour:
    m_SelectedTrigger: Selected
    m_DisabledTrigger: Disabled
  m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 4998400628217915919}
  m_OnClick:
    m_PersistentCalls:
      m_Calls: []
+--- !u!114 &4998400628217915919
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6757870033260325101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: deac5438096d5f64bbdf6b1934ef230e, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1.5
--- a/Assets/Courses/Prefabs/MultipleChoice
+++ b/Assets/Courses/Prefabs/MultipleChoice
@@ -1,5 +1,66 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &531490360556612897
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2753082322791035192}
+  - component: {fileID: 4172057369382989418}
+  m_Layer: 5
+  m_Name: Choices Fingerspelling
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2753082322791035192
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 531490360556612897}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4061330368179216051}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 45}
+  m_SizeDelta: {x: 250, y: 250}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!114 &4172057369382989418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 531490360556612897}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 250, y: 250}
+  m_Spacing: {x: 25, y: 25}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &2111479550264969558
 GameObject:
  m_ObjectHideFlags: 0
@@ -30,11 +91,11 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 4061330368179216051}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 118}
+  m_AnchoredPosition: {x: 0, y: 120}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &8814642598985503128
@@ -97,8 +158,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: 0, y: 10}
+  m_SizeDelta: {x: 50, y: 50}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4061330367519500106
 CanvasRenderer:
@@ -121,14 +182,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e9d7c25ce4800b840a37d69d5b876671, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -182,9 +243,9 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 4061330368179216060}
-        m_TargetAssemblyTypeName: StartPause, Assembly-CSharp
-        m_MethodName: 
+      - m_Target: {fileID: 1776754253067810093}
+        m_TargetAssemblyTypeName: PanelMultipleChoice, CourseScripts
+        m_MethodName: TogglePlayPause
        m_Mode: 1
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
@@ -302,8 +363,8 @@ RectTransform:
  m_Children:
  - {fileID: 4061330367711737314}
  - {fileID: 4061330368314523223}
-  - {fileID: 4061330369394122475}
  - {fileID: 5812954516243589766}
+  - {fileID: 2753082322791035192}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -362,13 +423,27 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e46fcdec22898f04eac0a7981baae26a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  previewMessage: {fileID: 4061330369394122452}
+  webcamScreen: {fileID: 4061330368314523222}
+  playSprite: {fileID: 21300000, guid: 05a683651206b994fa7921be6d84dddf, type: 3}
+  pauseSprite: {fileID: 21300000, guid: e9d7c25ce4800b840a37d69d5b876671, type: 3}
+  courseController: {fileID: 0}
  videoPlayer: {fileID: 0}
  playButton: {fileID: 4061330367519500107}
  optionContainer: {fileID: 5812954516243589766}
+  optionFingerspellingContainer: {fileID: 2753082322791035192}
  optionPrefab: {fileID: 6757870033260325101, guid: 1d4760e75172ce846819b46a0357c742, type: 3}
+  optionFingerspellingPrefab: {fileID: 6757870033260325101, guid: 3d0da629a7686e34cb645f9e375f1754, type: 3}
+  progress:
+    entries: []
+    courseIndex: 0
+    progress: -1
+    completedLearnables: 0
+    inUseLearnables: 0
+    totalLearnables: 0
+    learnables: []
  signs: []
  currentSignIndex: 0
+  isFingerSpelling: 0
 --- !u!95 &4803386377269900023
 Animator:
  serializedVersion: 5
@@ -462,142 +537,3 @@ MonoBehaviour:
    y: 0
    width: -1
    height: 1
--- !u!1 &4061330369394122452
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4061330369394122475}
-  - component: {fileID: 4061330369394122473}
-  - component: {fileID: 4061330369394122474}
-  m_Layer: 5
-  m_Name: PreviewMessage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &4061330369394122475
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4061330369394122452}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4061330368179216051}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 150, y: 150}
-  m_SizeDelta: {x: 900, y: 200}
-  m_Pivot: {x: 0.5, y: 0}
--- !u!222 &4061330369394122473
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4061330369394122452}
-  m_CullTransparentMesh: 1
--- !u!114 &4061330369394122474
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4061330369394122452}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'DEZE LES IS GESTART IN PREVIEW MODUS
-
-    Het is nog niet mogelijk deze
-    les te spelen via gebaren. Gebruik de ''Gebaar overslaan'' knop om naar het volgende
-    gebaar te gaan.'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4278190335
-  m_fontColor: {r: 1, g: 0, b: 0, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- a/Assets/Courses/Prefabs/Sign
+++ b/Assets/Courses/Prefabs/Sign
@@ -34,8 +34,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -420, y: 0}
-  m_SizeDelta: {x: 256, y: 256}
+  m_AnchoredPosition: {x: -420, y: 100}
+  m_SizeDelta: {x: 450, y: 450}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1321140593464287927
 MonoBehaviour:
@@ -97,7 +97,6 @@ RectTransform:
  - {fileID: 1321140594132691875}
  - {fileID: 1321140593464287926}
  - {fileID: 3006345639555307698}
-  - {fileID: 1321140593811418635}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -165,7 +164,6 @@ MonoBehaviour:
  feedbackText: {fileID: 3006345639897809774}
  feedbackProgressBar: {fileID: 3006345639643869492}
  feedbackProgressImage: {fileID: 3006345639958312625}
-  signName: {fileID: 1321140593811418632}
  signs: []
  currentSignIndex: 0
 --- !u!95 &2706222911073219473
@@ -188,143 +186,6 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
--- !u!1 &1321140593811418634
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1321140593811418635}
-  - component: {fileID: 1321140593811418633}
-  - component: {fileID: 1321140593811418632}
-  m_Layer: 5
-  m_Name: Current Sign
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1321140593811418635
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321140593811418634}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1321140593660784790}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -420, y: 260}
-  m_SizeDelta: {x: 600, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1321140593811418633
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321140593811418634}
-  m_CullTransparentMesh: 1
--- !u!114 &1321140593811418632
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321140593811418634}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Current sign
-
-'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4284235525
-  m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 48
-  m_fontSizeBase: 48
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &1321140594132691874
 GameObject:
  m_ObjectHideFlags: 0
@@ -405,7 +266,7 @@ MonoBehaviour:
  m_fontColor32:
    serializedVersion: 2
    rgba: 4278190335
-  m_fontColor: {r: 1, g: 0, b: 0, a: 1}
+  m_fontColor: {r: 0.9607843, g: 0.28627452, b: 0.23921569, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -499,9 +360,9 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 420, y: 100}
+  m_AnchoredPosition: {x: 82.5, y: 325}
  m_SizeDelta: {x: 900, y: 600}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &1321140594547902073
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -546,11 +407,11 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_Pivot.x
-      value: 0.5
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_Pivot.y
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_RootOrder
@@ -562,7 +423,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMin.x
@@ -570,7 +431,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_SizeDelta.x
@@ -610,11 +471,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 420
+      value: 82.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 200
+      value: -250
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
--- a/Assets/Courses/Prefabs/Sign
+++ b/Assets/Courses/Prefabs/Sign
@@ -80,7 +80,7 @@ MonoBehaviour:
  m_fontColor32:
    serializedVersion: 2
    rgba: 4278190335
-  m_fontColor: {r: 1, g: 0, b: 0, a: 1}
+  m_fontColor: {r: 0.9607843, g: 0.28627452, b: 0.23921569, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -139,143 +139,6 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6228868150191942578
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6228868150191942579}
-  - component: {fileID: 6228868150191942577}
-  - component: {fileID: 6228868150191942576}
-  m_Layer: 5
-  m_Name: Current Sign
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &6228868150191942579
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6228868150191942578}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6228868151418550170}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -420, y: 375}
-  m_SizeDelta: {x: 600, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6228868150191942577
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6228868150191942578}
-  m_CullTransparentMesh: 1
--- !u!114 &6228868150191942576
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6228868150191942578}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Current sign
-
-'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4284235525
-  m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 48
-  m_fontSizeBase: 48
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6228868150227029584
 GameObject:
  m_ObjectHideFlags: 0
@@ -447,9 +310,9 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 10}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &6228868150560507654
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -471,14 +334,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e9d7c25ce4800b840a37d69d5b876671, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -579,9 +442,9 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 420, y: 100}
+  m_AnchoredPosition: {x: 82.5, y: 325}
  m_SizeDelta: {x: 900, y: 600}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &6228868151341466127
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -654,7 +517,6 @@ RectTransform:
  - {fileID: 6228868149649096748}
  - {fileID: 6228868150458477981}
  - {fileID: 6228868150005252292}
-  - {fileID: 6228868150191942579}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -716,6 +578,8 @@ MonoBehaviour:
  feedbackProgressObject: {fileID: 6228868150005252295}
  previewMessage: {fileID: 6228868149649096753}
  isPreview: 0
+  playSprite: {fileID: 21300000, guid: 05a683651206b994fa7921be6d84dddf, type: 3}
+  pauseSprite: {fileID: 21300000, guid: e9d7c25ce4800b840a37d69d5b876671, type: 3}
  videoPlayer: {fileID: 0}
  playButton: {fileID: 6228868150560507657}
  webcamScreen: {fileID: 6228868151341466126}
@@ -724,7 +588,6 @@ MonoBehaviour:
  feedbackText: {fileID: 6228868150483786520}
  feedbackProgressBar: {fileID: 6228868149697554754}
  feedbackProgressImage: {fileID: 6228868150406000327}
-  signName: {fileID: 6228868150191942576}
  signs: []
  currentSignIndex: 0
 --- !u!95 &858417495495149503
@@ -756,11 +619,11 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_Pivot.x
-      value: 0.5
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_Pivot.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_RootOrder
@@ -772,7 +635,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMin.x
@@ -780,7 +643,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_SizeDelta.x
@@ -820,11 +683,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 420
+      value: 82.5
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 200
+      value: -250
      objectReference: {fileID: 0}
    - target: {fileID: 4318122119930585316, guid: 7c71c65ecb5fe0449a8b0d178987f016, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
--- a/Assets/Courses/Scenes/CourseScreen.unity
+++ b/Assets/Courses/Scenes/CourseScreen.unity
@@ -394,6 +394,82 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100123244}
  m_CullTransparentMesh: 1
+--- !u!1 &250984719
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 250984720}
+  - component: {fileID: 250984722}
+  - component: {fileID: 250984721}
+  m_Layer: 5
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &250984720
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250984719}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2018448395}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &250984721
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250984719}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 02283f528ead8084db69c7d8a459f0af, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 0.406
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &250984722
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250984719}
+  m_CullTransparentMesh: 1
 --- !u!1 &257279696
 GameObject:
  m_ObjectHideFlags: 0
@@ -435,7 +511,7 @@ RectTransform:
  - {fileID: 551249239}
  - {fileID: 642206910}
  m_Father: {fileID: 1559094126}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
@@ -700,10 +776,10 @@ RectTransform:
  m_Father: {fileID: 1559094126}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -25}
-  m_SizeDelta: {x: 1200, y: 100}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 0, y: 100}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &388014849
 MonoBehaviour:
@@ -734,8 +810,8 @@ MonoBehaviour:
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4279242768
-  m_fontColor: {r: 0.0627451, g: 0.0627451, b: 0.0627451, a: 1}
+    rgba: 4284235525
+  m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -835,7 +911,7 @@ RectTransform:
  m_Children:
  - {fileID: 981855468}
  m_Father: {fileID: 1559094126}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
@@ -1543,9 +1619,9 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 1122267055}
-        m_TargetAssemblyTypeName: TemplateCourse, Assembly-CSharp
-        m_MethodName: 
+      - m_Target: {fileID: 1122267056}
+        m_TargetAssemblyTypeName: CoursesController, CourseScripts
+        m_MethodName: StartCourseController
        m_Mode: 1
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
@@ -2003,7 +2079,7 @@ GameObject:
  - component: {fileID: 993952932}
  - component: {fileID: 993952931}
  m_Layer: 5
-  m_Name: Video
+  m_Name: VideoController
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -2057,7 +2133,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1100468616
 GameObject:
@@ -2173,6 +2249,7 @@ MonoBehaviour:
  CoursesButton: {fileID: 839294691}
  timeSpent: {fileID: 77614869}
  videoPlayer: {fileID: 993952931}
+  progressBar: {fileID: 1677120325}
  confettiAnimation: {fileID: 257279698}
  panelSignWithVideoAndImagePrefab: {fileID: 6228868151418550173, guid: ed122bc34368fca4f9c28e96b772da66, type: 3}
  panelSignWithImagePrefab: {fileID: 1321140593660784785, guid: 41cc30039c205e04baf44453287d6469, type: 3}
@@ -2352,6 +2429,18 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 1559094126}
    m_Modifications:
+    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1122267056}
+    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: ReturnToActivityScreen
+      objectReference: {fileID: 0}
+    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: CoursesController, CourseScripts
+      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -2386,11 +2475,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -2440,7 +2529,8 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 4518652150503380115, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
 --- !u!224 &1335886460 stripped
 RectTransform:
@@ -2637,11 +2727,12 @@ RectTransform:
  m_Children:
  - {fileID: 388014848}
  - {fileID: 1383144367}
-  - {fileID: 1335886460}
  - {fileID: 429306633}
  - {fileID: 257279697}
+  - {fileID: 1335886460}
+  - {fileID: 1677120324}
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -2724,6 +2815,172 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1600926567}
  m_CullTransparentMesh: 1
+--- !u!1 &1614792575
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1614792576}
+  - component: {fileID: 1614792578}
+  - component: {fileID: 1614792577}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1614792576
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1614792575}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1677120324}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1614792577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1614792575}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 42d6d4c291d8a8a46bd0d545fd445c3d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1614792578
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1614792575}
+  m_CullTransparentMesh: 1
+--- !u!1 &1677120323
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1677120324}
+  - component: {fileID: 1677120325}
+  m_Layer: 5
+  m_Name: Progress
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1677120324
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1677120323}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 1614792576}
+  - {fileID: 2018448395}
+  m_Father: {fileID: 1559094126}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -10}
+  m_SizeDelta: {x: 369, y: 40}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1677120325
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1677120323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 0
+  m_TargetGraphic: {fileID: 0}
+  m_FillRect: {fileID: 250984720}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 0.406
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1697464981
 GameObject:
  m_ObjectHideFlags: 0
@@ -3087,3 +3344,40 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2017030785}
  m_CullTransparentMesh: 1
+--- !u!1 &2018448394
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2018448395}
+  m_Layer: 5
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2018448395
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2018448394}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 250984720}
+  m_Father: {fileID: 1677120324}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Courses/Scripts/CoursesController.cs
+++ b/Assets/Courses/Scripts/CoursesController.cs
@@ -12,6 +12,9 @@ using UnityEngine.Video;
 /// </summary>
 public class CoursesController : AbstractFeedback
 {
+    /// <summary>
+    /// Reference to the objet holding the title
+    /// </summary>
    public TMP_Text courseTitle;

    /// <summary>
@@ -44,12 +47,6 @@ public class CoursesController : AbstractFeedback
    /// </summary>
    private int maxWords;

-    /// <summary>
-    /// Number of correct words so far
-    /// (can be modified to a list or something like that to give better feedback)
-    /// </summary>
-    private int correctWords = 0;
-
    /// <summary>
    /// The "finished" screen
    /// </summary>
@@ -112,11 +109,55 @@ public class CoursesController : AbstractFeedback
    /// </summary>
    protected string previousIncorrectSign = null;

+    /// <summary>
+    /// Keeps track of what type of panel is currently being used
+    /// </summary>
+    protected int panelId = 0;
+
+    /// <summary>
+    /// Boolean used to check whether the user has already answered the question
+    /// </summary>
+    private bool hasAnswered = false;
+
+    /// <summary>
+    /// Boolean used to check whether  SlideIn animation is playing
+    /// </summary>
+    private bool isNextSignInTransit = false;
+
+    /// <summary>
+    /// Reference to course progress bar
+    /// </summary>
+    public Slider progressBar;
+
+    /// <summary>
+    /// Reference to the animator of the confetti animation
+    /// </summary>
    public Animator confettiAnimation;
+
+    /// <summary>
+    /// Panel with video&image prefab
+    /// </summary>
    public GameObject panelSignWithVideoAndImagePrefab;
+
+    /// <summary>
+    /// Panel with image prefab
+    /// </summary>
    public GameObject panelSignWithImagePrefab;
+
+    /// <summary>
+    /// Panel with multiplechoice prefab
+    /// </summary>
    public GameObject panelMultipleChoicePrefab;
+
+    /// <summary>
+    /// Reference to the canvas to put the panels into
+    /// </summary>
    public Transform canvas;
+
+    /// <summary>
+    /// Reference to the previous panel, 
+    /// so it can be deleted when its done playing its exit animation
+    /// </summary>
    private GameObject previousPanel = null;

    /// <summary>
@@ -142,19 +183,24 @@ public class CoursesController : AbstractFeedback
        course = courselist.courses[courselist.currentCourseIndex];
        maxWords = course.theme.learnables.Count;

+        // Reload from disk (course may be reset)
+        PersistentDataController.GetInstance().Load();
        // Create entry in current user for keeping track of progress
-        //PersistentDataController pdc = PersistentDataController.GetInstance();
-        //pdc.Load();
        user = UserList.GetCurrentUser();
        progress = user.GetCourseProgress(course.index);
        if (progress == null)
        {
            progress = new PersistentDataController.SavedCourseProgress();
            progress.courseIndex = course.index;
+            int index = 0;
+            foreach (Learnable learnable in course.theme.learnables)
+            {
+                progress.AddLearnable(learnable.name, index++);
+            }
            user.AddCourseProgress(progress);
        }
        UserList.Save();
-        courseTitle.text = course.title;
+        progressBar.value = progress.progress;

        currentWordIndex = 0;
        previousPanel = SetupPanel();
@@ -165,29 +211,38 @@ public class CoursesController : AbstractFeedback
        startMoment = DateTime.Now;
    }

+    /// <summary>
+    /// Fetch the next sign and its panel type
+    /// </summary>
+    /// <returns>A tuple of {next sign index, panel type}</returns>
+    /// <remarks>
+    /// The different panel types:<br></br>
+    /// 0 : panelSignWithVideoAndImagePrefab<br></br>
+    /// 1 : panelMultipleChoicePrefab<br></br>
+    /// 2 : panelSignWithImagePrefab
+    /// </remarks>
    private Tuple<int, int> FetchSign()
    {
-        // TODO: @Tibe here you need to provide other signs and there question method
-
-        /**************************
-         * TODO: @Tibe
-         * 
-         * In deze functie beslist welk panel je nu nodig hebt
-         * Momenteel doe ik gwn iets om te wisselen tussen de twee (moet zeker weg want je begint ALTIJD met een imageANDvideo
-         * 
-         * Je ziet zelf maar hoe groot je de sets van woorden maakt, om de 5 ofzo
-         * Altijd eerst video and image, nadien kan je afwisselen, mag random
-         * 
-         * ALSO:
-         * Hiervoor moet ge bij Dries zijn, maar man is verdwenen. (100 jaar gingen voorbij en mijn broer en ik vonden een nieuwe oorzaak voor hoofdpijn)
-         * Progress gaat ook aangepast moeten worden, als een user terugkeert tijdens een course en later hervat ga je moeten weten welke set die zat
-         * Zeker als ge woorden in een andere volgorde zou willen doen, gaat ge echt nog aan uw 40u geraken :)
-         * --> dat gaat bijgehouden worden in een van die user files. (Stalk Dries indien nodig, voor andere zaken kan je mij ook vragen stellen)
-         * 
-         * *************************/
-
-        int panelChosen = currentWordIndex % 2 + 1;
-        return Tuple.Create(currentWordIndex, panelChosen);
+        PersistentDataController.SavedLearnableProgress learnable = progress.GetRandomLearnable();
+        int panelChosen;
+        if (course.theme.modelIndex == ModelIndex.NONE)
+        {
+            // only multiple choice works in preview mode
+            panelChosen = 1;
+        }
+        else if (learnable.progress > 2.0f)
+        {
+            panelChosen = 2;
+        }
+        else if (learnable.progress > 1.0f)
+        {
+            panelChosen = 1;
+        }
+        else
+        {
+            panelChosen = 0;
+        }
+        return Tuple.Create(learnable.index, panelChosen);
    }

    /// <summary>
@@ -197,78 +252,59 @@ public class CoursesController : AbstractFeedback
    /// </summary>
    public void NextSign()
    {
-        // If the currentindex >= maxwords, it indicated that the course is already finished, running the next code is the meaningless.
-        if (currentWordIndex >= maxWords) { return; }
+        // This function is also called (async) when pressing the 'Gebaar overslaan' button,
+        // so check for condition so we don't skip multiple signs
+        if (isNextSignInTransit || maxWords <= progress.completedLearnables)
+            return;

-        confettiAnimation.SetTrigger("Display Confetti");
-
-        // Goto the next word/letter
-        currentWordIndex++;
-
-        // TODO: fix correct word count
-        correctWords++;
-        progress.progress = (float)correctWords / (float)maxWords;
-        UserList.Save();
+        progress.progress = (float)progress.completedLearnables / (float)maxWords;
+        progressBar.value = progress.progress;

        // Update UI if course is not finished yet
-        if (currentWordIndex < maxWords)
+        if (progress.completedLearnables < maxWords)
        {
            // Set next sign/video/image
            StartCoroutine(CRNextSign());
        }
        // Finish course and record progress
-        else
+        if (progress.completedLearnables == maxWords)
        {
            FinishCourse();
        }
    }

+    /// <summary>
+    /// Coroutine for going to the next sign
+    /// </summary>
+    /// <returns></returns>
    private IEnumerator CRNextSign()
    {
+        isNextSignInTransit = true;
        GameObject newPanel = SetupPanel();
        previousPanel.transform.SetAsFirstSibling();
-        newPanel.GetComponent<Animator>().SetTrigger("Slide Panel");
+        newPanel.GetComponent<Animator>().SetTrigger("Slide Panel In");
+        if (previousPanel != null)
+            previousPanel.GetComponent<Animator>().SetTrigger("Slide Panel Out");

        yield return new WaitForSeconds(1.0f);

        confettiAnimation.ResetTrigger("Display Confetti");
        GameObject.Destroy(previousPanel);
        previousPanel = newPanel;
+        hasAnswered = false;
+        isNextSignInTransit = false;
    }

+    /// <summary>
+    /// Setup a new panel
+    /// </summary>
+    /// <returns>Reference to the GameObject of the panel</returns>
    private GameObject SetupPanel()
    {
-        int panelId;
        (currentWordIndex, panelId) = FetchSign().ToValueTuple();
        switch (panelId)
        {
-            case 0: return null; // TODO: @Tibe multiple choice setup
-                /**************************
-                 * TODO: @Tibe
-                 * 
-                 * Hier moet de panelMultipleChoice worden aangemaakt
-                 * Geef publieke dingen mee aan uw script.
-                 * Kan je eventueel zelf aanpassen,
-                 * naargelang hoe je het wilt implementeren 
-                 * 
-                 * *************************/
-            case 1:
-                {
-                    GameObject panel = GameObject.Instantiate(panelSignWithImagePrefab, canvas);
-                    panel.transform.SetAsFirstSibling();
-
-                    PanelWithImage script = panel.GetComponent<PanelWithImage>();
-                    script.signs = course.theme.learnables;
-                    script.currentSignIndex = currentWordIndex;
-                    script.isPreview = (course.theme.modelIndex == ModelIndex.NONE);
-                    feedbackProgress = script.feedbackProgressBar;
-                    feedbackProgressImage = script.feedbackProgressImage;
-                    feedbackText = script.feedbackText;
-                    script.Display();
-                    signPredictor.SwapScreen(script.webcamScreen);
-                    return panel;
-                }
-            case 2:
+            case 0:
                {
                    GameObject panel = GameObject.Instantiate(panelSignWithVideoAndImagePrefab, canvas);
                    panel.transform.SetAsFirstSibling();
@@ -283,6 +319,41 @@ public class CoursesController : AbstractFeedback
                    feedbackText = script.feedbackText;
                    script.Display();
                    signPredictor.SwapScreen(script.webcamScreen);
+                    courseTitle.text = "Voer het gebaar uit voor \"" + course.theme.learnables[currentWordIndex].name + "\"";
+                    return panel;
+                }
+            case 1:
+                {
+                    GameObject panel = GameObject.Instantiate(panelMultipleChoicePrefab, canvas);
+                    panel.transform.SetAsFirstSibling();
+
+                    PanelMultipleChoice script = panel.GetComponent<PanelMultipleChoice>();
+                    script.signs = course.theme.learnables;
+                    script.currentSignIndex = currentWordIndex;
+                    script.videoPlayer = videoPlayer;
+                    script.courseController = this;
+                    script.progress = progress;
+                    script.isFingerSpelling = course.theme.title == "Handalfabet";
+                    script.Display();
+                    signPredictor.SwapScreen(script.webcamScreen);
+                    courseTitle.text = "Welk gebaar wordt uitgebeeld?";
+                    return panel;
+                }
+            case 2:
+                {
+                    GameObject panel = GameObject.Instantiate(panelSignWithImagePrefab, canvas);
+                    panel.transform.SetAsFirstSibling();
+
+                    PanelWithImage script = panel.GetComponent<PanelWithImage>();
+                    script.signs = course.theme.learnables;
+                    script.currentSignIndex = currentWordIndex;
+                    script.isPreview = (course.theme.modelIndex == ModelIndex.NONE);
+                    feedbackProgress = script.feedbackProgressBar;
+                    feedbackProgressImage = script.feedbackProgressImage;
+                    feedbackText = script.feedbackText;
+                    script.Display();
+                    signPredictor.SwapScreen(script.webcamScreen);
+                    courseTitle.text = "Voer het gebaar uit voor \"" + course.theme.learnables[currentWordIndex].name + "\"";
                    return panel;
                }
        }
@@ -320,7 +391,8 @@ public class CoursesController : AbstractFeedback
    /// <returns></returns>
    protected override IEnumerator UpdateFeedback()
    {
-        if (currentWordIndex < course.theme.learnables.Count)
+        // Check if the current word index is still in bounds, and if the current panel type is not multiple choice
+        if (currentWordIndex < course.theme.learnables.Count && panelId != 1 && !hasAnswered)
        {
            // Get current sign
            Learnable sign = course.theme.learnables[currentWordIndex];
@@ -368,7 +440,7 @@ public class CoursesController : AbstractFeedback

                    float oldValue = feedbackProgress.value;
                    // use an exponential scale 
-                    float newValue = Mathf.Exp(4 * (accCurrentSign - 1.0f));
+                    float newValue = Mathf.Exp(4 * (Mathf.Clamp(accCurrentSign / sign.thresholdPercentage, 0.0f, 1.0f) - 1.0f));
                    feedbackProgress.gameObject.Tween("FeedbackUpdate", oldValue, newValue, 0.2f, TweenScaleFunctions.CubicEaseInOut, (t) =>
                    {
                        if (feedbackProgress != null)
@@ -419,11 +491,59 @@ public class CoursesController : AbstractFeedback
    /// Function to check equality between the current sign and the sign that the model predicted, if they are equal then the next sign is fetched.
    /// </summary>
    /// <param name="predicted"></param>
-    private void NextSignIfCorrect(string current, string predicted)
+    public void NextSignIfCorrect(string current, string predicted)
    {
-        if (current == predicted)
-            NextSign();
+        if (!hasAnswered)
+        {
+            if (current == predicted)
+            {
+                hasAnswered = true;
+                progress.UpdateLearnable(predicted, 1.5f);
+                confettiAnimation.SetTrigger("Display Confetti");
+                StartCoroutine(WaitNextSign());
+            }
+            else
+            {
+                // currently ignore wrong signs as "J" doesn't work well enough
+            }
+        }

-        // TODO: @Tibe cache the incorrect values here
+    }
+
+    private IEnumerator WaitNextSign()
+    {
+        // Wait for 0.75 seconds
+        yield return new WaitForSeconds(0.75f);
+        NextSign();
+    }
+
+    /// <summary>
+    /// Function to check equality between the current sign and the sign that the model predicted, if they are equal then the next sign is fetched.
+    /// </summary>
+    /// <param name="predicted"></param>
+    public void NextSignMultipleChoice(string current, string predicted)
+    {
+        if (!hasAnswered)
+        {
+            hasAnswered = true;
+            if (current == predicted)
+            {
+                progress.UpdateLearnable(predicted, 1.5f);
+                confettiAnimation.SetTrigger("Display Confetti");
+            }
+            else
+            {
+                progress.UpdateLearnable(predicted, -1.0f);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Callback for the 'back' button
+    /// </summary>
+    public void ReturnToActivityScreen()
+    {
+        UserList.Save();
+        SystemController.GetInstance().BackToPreviousScene();
    }
 }
--- a/Assets/Courses/Scripts/PanelMultipleChoice.cs
+++ b/Assets/Courses/Scripts/PanelMultipleChoice.cs
@@ -1,16 +1,41 @@
+using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Video;

+
 public class PanelMultipleChoice : MonoBehaviour
 {
-    public GameObject previewMessage;
+    /// <summary>
+    /// Reference to the webcam screen
+    /// </summary>
+    public RawImage webcamScreen;
+
+    /// <summary>
+    /// Video 'play' sprite
+    /// </summary>
+    public Sprite playSprite;
+
+    /// <summary>
+    /// Video 'pause' sprite
+    /// </summary>
+    public Sprite pauseSprite;
+
+    /// <summary>
+    /// Reference to its course controller to be able to go to call NextSignMultipleChoice to go to the next panel
+    /// </summary>
+    public CoursesController courseController;

    /// <summary>
    /// Reference to instructional video player
    /// </summary>
    public VideoPlayer videoPlayer;
+
+    /// <summary>
+    /// Refrence to the video play/pause button
+    /// </summary>
    public Image playButton;

    /// <summary>
@@ -18,29 +43,152 @@ public class PanelMultipleChoice : MonoBehaviour
    /// </summary>
    public Transform optionContainer;

+    /// <summary>
+    /// Reference to the image for displaying the current words sprite, for a fingerspelling courses
+    /// </summary>
+    public Transform optionFingerspellingContainer;
+
+    /// <summary>
+    /// Reference to the option prefab
+    /// </summary>
    public GameObject optionPrefab;

+    /// <summary>
+    /// Reference to the option prefab, for a fingerspelling course
+    /// </summary>
+    public GameObject optionFingerspellingPrefab;

+    /// <summary>
+    /// Reference to the saved progress
+    /// </summary>
+    public PersistentDataController.SavedCourseProgress progress;
+
+    /// <summary>
+    /// The current sign that will be displayed
+    /// </summary>
+    private Learnable currentSign;
+
+    /// <summary>
+    /// Reference to all signs in this course
+    /// </summary>
    public List<Learnable> signs;
+
+    /// <summary>
+    /// Index of the current sign
+    /// </summary>
    public int currentSignIndex;

+    /// <summary>
+    /// Boolean used to check whether the current course is a fingerspelling course
+    /// </summary>
+    public bool isFingerSpelling;
+
+    /// <summary>
+    /// Boolean used to check whether the user has already answered the question
+    /// </summary>
+    private bool hasAnswered = false;
+
+    /// <summary>
+    /// Get a list of wrongs answers
+    /// </summary>
+    /// <param name="notThisIndex">The index of the correct sign</param>
+    /// <returns></returns>
+    public List<Learnable> GetWrongOptions(int notThisIndex)
+    {
+        List<Learnable> randomSigns = new List<Learnable>();
+        // TODO: find more koosjer  way to do this
+        while (randomSigns.Count < 3)
+        {
+            int index = progress.GetRandomLearnable().index;
+            if (index != notThisIndex && !randomSigns.Contains(signs[index]))
+            {
+                randomSigns.Add(signs[index]);
+            }
+        }
+
+        return randomSigns;
+    }
+
+    /// <summary>
+    /// Update the display of this panel
+    /// </summary>
    public void Display()
    {
-        Learnable currentSign = signs[currentSignIndex];
+        currentSign = signs[currentSignIndex];
        videoPlayer.aspectRatio = VideoAspectRatio.FitInside;
        videoPlayer.clip = currentSign.clip;
        videoPlayer.Play();
+        // Gets three random selected signs from the list signs which are not equal to currentSign
+        List<Learnable> allOptions = GetWrongOptions(currentSignIndex);

-        // TODO: @Tibe find 3 other random indexes and make buttons for mc question (and set images and callbacks)
+        // Add the correct sign at a random position in the list of all options
+        int randomIndex = UnityEngine.Random.Range(0, allOptions.Count + 1);
+        allOptions.Insert(randomIndex, currentSign);

-        /**************************
-         * TODO: @Tibe
-         * 
-         * Voor het initialiseren van die multiplechoice opties, er bestaat een prefab van die button, moet maar eens kijken
-         * Dus zelf gwn woorden kiezen voor de andere opties ad random.
-         * Zie dat je geen dubbels hebt in je opties (logisch)
-         * 
-         * *************************/
+        var prefab = isFingerSpelling ? optionFingerspellingPrefab : optionPrefab;
+        var container = isFingerSpelling ? optionFingerspellingContainer : optionContainer;
+        foreach (Learnable option in allOptions)
+        {
+            GameObject multipleChoiceOption = GameObject.Instantiate(prefab, container);
+            if (!isFingerSpelling)
+                multipleChoiceOption.transform.Find("TextOption").GetComponent<TMP_Text>().text = option.name;
+            multipleChoiceOption.transform.Find("ImageOption").GetComponent<Image>().sprite = option.image;
+
+            Button button = multipleChoiceOption.GetComponent<Button>();
+            button.onClick.AddListener(() =>
+            {
+                if (!hasAnswered)
+                {
+                    courseController.NextSignMultipleChoice(currentSign.name, option.name);
+                    ShowAnswers(option.name);
+                    hasAnswered = true;
+                }
+            });
+        }
+
+    }
+
+    /// <summary>
+    /// Show the asnwers
+    /// </summary>
+    /// <param name="answerName">The name of the clicked sign</param>
+    public void ShowAnswers(string answerName)
+    {
+        if (answerName == currentSign.name)
+        {
+            courseController.courseTitle.text = "Correct!";
+        }
+        else
+        {
+            courseController.courseTitle.text = "Spijtig, fout";
+        }
+
+        var container = isFingerSpelling ? optionFingerspellingContainer : optionContainer;
+        for (int i = 0; i < container.childCount; i++)
+        {
+            // Get the i-th child object
+            Transform childTransform = container.GetChild(i);
+
+            // Change the background color of the Button
+            Color col = new Color(0xf5 / 255.0f, 0x49 / 255.0f, 0x3d / 255.0f);
+            if (childTransform.Find("ImageOption").GetComponent<Image>().sprite == currentSign.image)
+            {
+                col = new Color(0x8b / 255.0f, 0xd4 / 255.0f, 0x5e / 255.0f);
+            }
+            childTransform.GetComponent<Image>().color = col;
+        }
+        StartCoroutine(GoToNextScreen());
+    }
+
+    /// <summary>
+    /// Wait and go to the next sign
+    /// </summary>
+    /// <returns></returns>
+    private IEnumerator GoToNextScreen()
+    {
+        // Wait for 5 seconds
+        yield return new WaitForSeconds(3.0f);
+        courseController.NextSign();
    }

    /// <summary>
@@ -51,10 +199,18 @@ public class PanelMultipleChoice : MonoBehaviour
    public void TogglePlayPause()
    {
        if (!videoPlayer.isPlaying)
-            // Play video and hide button
+        {
+            // Play video and switch sprite of button
+            playButton.sprite = pauseSprite;
            videoPlayer.Play();
+        }
+
        else
-            // Pause video and show button
+        {
+            // Pause video and and switch sprite of button
+            playButton.sprite = playSprite;
            videoPlayer.Pause();
+        }
+
    }
 }
--- a/Assets/Courses/Scripts/PanelWithImage.cs
+++ b/Assets/Courses/Scripts/PanelWithImage.cs
@@ -33,18 +33,12 @@ public class PanelWithImage : MonoBehaviour
    /// </summary>
    public Image feedbackProgressImage;

-    /// <summary>
-    /// Reference to the image for displaying the current words sprite
-    /// </summary>
-    public TMP_Text signName;
-
    public List<Learnable> signs;
    public int currentSignIndex;

    public void Display()
    {
        Learnable currentSign = signs[currentSignIndex];
-        signName.text = currentSign.name;

        feedbackProgressObject.SetActive(!isPreview);
        previewMessage.SetActive(isPreview);
--- a/Assets/Courses/Scripts/PanelWithVideoAndImage.cs
+++ b/Assets/Courses/Scripts/PanelWithVideoAndImage.cs
@@ -10,6 +10,9 @@ public class PanelWithVideoAndImage : MonoBehaviour
    public GameObject previewMessage;
    public bool isPreview;

+    public Sprite playSprite;
+    public Sprite pauseSprite;
+
    /// <summary>
    /// Reference to instructional video player
    /// </summary>
@@ -39,18 +42,12 @@ public class PanelWithVideoAndImage : MonoBehaviour
    /// </summary>
    public Image feedbackProgressImage;

-    /// <summary>
-    /// Reference to the image for displaying the current words sprite
-    /// </summary>
-    public TMP_Text signName;
-
    public List<Learnable> signs;
    public int currentSignIndex;

    public void Display()
    {
        Learnable currentSign = signs[currentSignIndex];
-        signName.text = currentSign.name;
        videoPlayer.aspectRatio = VideoAspectRatio.FitInside;
        videoPlayer.clip = currentSign.clip;
        videoPlayer.Play();
@@ -77,10 +74,18 @@ public class PanelWithVideoAndImage : MonoBehaviour
    public void TogglePlayPause()
    {
        if (!videoPlayer.isPlaying)
-            // Play video and hide button
+        {
+            // Play video and switch sprite of button
+            playButton.sprite = pauseSprite;
            videoPlayer.Play();
+        }
+           
        else
-            // Pause video and show button
+        {
+            // Pause video and and switch sprite of button
+            playButton.sprite = playSprite;
            videoPlayer.Pause();
+        }
+            
    }
 }
--- a/Assets/Hangman/Scenes/HangmanGame.unity
+++ b/Assets/Hangman/Scenes/HangmanGame.unity
@@ -6339,7 +6339,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 60bb0835fc4bbb043b9b3d8ef48f96a8, type: 2}
+  m_Texture: {fileID: 8400000, guid: b0382d4acabd441499108c97444d642a, type: 2}
  m_UVRect:
    serializedVersion: 2
    x: 1
@@ -6668,26 +6668,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 1286703099}
    m_Modifications:
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 1417872200}
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: Back
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: BackButton, CommonScripts
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
-      value: Common/Scenes/ThemeSelection
-      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -6722,11 +6702,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -6783,17 +6763,6 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
  m_PrefabInstance: {fileID: 1417872198}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &1417872200 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4518652150503380115, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
-  m_PrefabInstance: {fileID: 1417872198}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c3dd279b546423e4a8a1b28819a6c4a1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1458786488
 GameObject:
  m_ObjectHideFlags: 0
@@ -8743,7 +8712,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 60bb0835fc4bbb043b9b3d8ef48f96a8, type: 2}
+  m_Texture: {fileID: 8400000, guid: b0382d4acabd441499108c97444d642a, type: 2}
  m_UVRect:
    serializedVersion: 2
    x: 1
--- a/Assets/JustSign/Scenes/JustSignGame.unity
+++ b/Assets/JustSign/Scenes/JustSignGame.unity
@@ -2000,11 +2000,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/MediaPipeUnity/Scripts/SignPredictor.cs
+++ b/Assets/MediaPipeUnity/Scripts/SignPredictor.cs
@@ -136,7 +136,7 @@ public class SignPredictor : MonoBehaviour
    /// <summary>
    /// Webcam texture
    /// </summary>
-    private WebCamTexture webcamTexture;
+    private WebCamTexture webcamTexture = null;

    /// <summary>
    /// Input texture
@@ -418,7 +418,7 @@ public class SignPredictor : MonoBehaviour
        }
    }

-    
+
    public void SetModel(ModelIndex index)
    {
        this.modelList.SetCurrentModel(index);
@@ -430,7 +430,14 @@ public class SignPredictor : MonoBehaviour
    public void SwapScreen(RawImage screen)
    {
        this.screen = screen;
-        this.screen.texture = webcamTexture;
+        //width = webcamTexture.width;
+        //height = webcamTexture.height;
+        if (webcamTexture != null)
+        {
+            float webcamAspect = (float)webcamTexture.width / (float)webcamTexture.height;
+            this.screen.rectTransform.sizeDelta = new Vector2(this.screen.rectTransform.sizeDelta.y * webcamAspect, (this.screen.rectTransform.sizeDelta.y));
+            this.screen.texture = webcamTexture;
+        }
    }

 }
--- a/Assets/SpellingBee/Scenes/SpellingBeeGame.unity
+++ b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity
@@ -1278,11 +1278,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 300
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 120
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -4551,7 +4551,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 60bb0835fc4bbb043b9b3d8ef48f96a8, type: 2}
+  m_Texture: {fileID: 8400000, guid: b0382d4acabd441499108c97444d642a, type: 2}
  m_UVRect:
    serializedVersion: 2
    x: 1
--- a/Assets/SystemArchitecture/Scripts/PersistentDataController.cs
+++ b/Assets/SystemArchitecture/Scripts/PersistentDataController.cs
@@ -19,7 +19,7 @@ public class PersistentDataController
    /// Current implementation version of the PersistentDataController
    /// </summary>
    /// <remarks>MSB represent sprint version, LSB represent subversion</remarks>
-    public static readonly int VERSION = 0x04_01;
+    public static readonly int VERSION = 0x04_03;

    /// <summary>
    /// Path of the <c>.json</c>-file to store all serialized data
@@ -184,8 +184,139 @@ public class PersistentDataController
    [Serializable]
    public class SavedCourseProgress : PersistentDataContainer
    {
+
+        /// <summary>
+        /// Update the progress value of the SavedLearnableProgress with the given learnableName.
+        /// </summary>
+        /// <param name="learnableName"></param>
+        /// <param name="addValue"></param>
+        public void UpdateLearnable(string learnableName, float addValue)
+        {
+            SavedLearnableProgress learnable = learnables.Find(l => l.name == learnableName);
+            if (learnable == null)
+            {
+                return;
+            }
+
+            // Update the progress value of the SavedLearnableProgress
+            learnable.progress += addValue;
+            // crop the learnable progress around -5 and 5
+            if (learnable.progress > 5.0f)
+            {
+                learnable.progress = 5.0f;
+            }
+            else if (learnable.progress < -5.0f)
+            {
+                learnable.progress = -5.0f;
+            }
+
+            // if learnable progress is big enough it is "completed"
+
+            if (learnable.progress > 3)
+            {
+                completedLearnables++;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns> bool which indicates if there are enough inUseLearnables </returns>
+        private bool EnoughLearnables()
+        {
+            // There need to be more then 5 non completed learnables
+            return inUseLearnables - completedLearnables > 5 || totalLearnables == inUseLearnables;
+        }
+
+        /// <summary>
+        /// Find a SavedLearnableProgress with the given name
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns> SavedLearnableProgress with the given name </returns>
+        public SavedLearnableProgress FindLearnable(string name)
+        {
+            return learnables.Find(l => l.name == name);
+        }
+
+        /// <summary>
+        /// find learnable in learnables which is not yet in use, and set it active
+        /// </summary>
+        /// <returns> bool which indicates the success of the function </returns>
+        public SavedLearnableProgress AddNewLearnable()
+        {
+            SavedLearnableProgress learnable = learnables.Find(l => !l.inUse);
+            if (learnable == null)
+            {
+                return null;
+            }
+            learnable.inUse = true;
+            inUseLearnables++;
+            return learnable;
+        }
+
+        /// <summary>
+        /// Gets a random inUse learnable
+        /// </summary>
+        /// <returns> a randomly selected inUse SavedLearnable which is not yet completed</returns>
+        public SavedLearnableProgress GetRandomLearnable()
+        {
+            if (!EnoughLearnables())
+            {
+                return AddNewLearnable();
+            }
+            else
+            {
+                // only select inUse learnables which are not yet completed (progress < 3.5f)
+                List<SavedLearnableProgress> inUseLearnables = learnables.FindAll(l => l.inUse && l.progress <= 3.5f);
+
+                if (inUseLearnables.Count == 0)
+                {
+                    return null;
+                }
+
+                // Select a random index from the in-use learnables list
+                int randomIndex = UnityEngine.Random.Range(0, inUseLearnables.Count);
+                return inUseLearnables[randomIndex];
+            }
+        }
+
+        /// <summary>
+        /// Create new SavedLearnableProgress object and assigns the index and name values
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="index"></param>
+        /// <returns> bool which indicates the success of the function</returns>
+        public bool AddLearnable(string name, int index)
+        {
+            if (learnables.Any(learnable => learnable.name == name || learnable.index == index))
+                return false;
+
+            SavedLearnableProgress savedLearnableProgress = new SavedLearnableProgress();
+            savedLearnableProgress.index = index;
+            savedLearnableProgress.name = name;
+            learnables.Add(savedLearnableProgress);
+            totalLearnables++;
+            return true;
+        }
+
        public CourseIndex courseIndex;
        public float progress = -1.0f;
+        public int completedLearnables = 0;
+        public int inUseLearnables = 0;
+        public int totalLearnables = 0;
+        public List<SavedLearnableProgress> learnables = new List<SavedLearnableProgress>();
+    }
+
+    /// <summary>
+    /// Stored individual learnable progress
+    /// </summary>
+    [Serializable]
+    public class SavedLearnableProgress : PersistentDataContainer
+    {
+        public int index;
+        public bool inUse = false;
+        public string name;
+        public float progress = 0.0f;
    }

    /// <summary>
--- a/Assets/SystemArchitecture/Tests/PersistentDataControllerTest.cs
+++ b/Assets/SystemArchitecture/Tests/PersistentDataControllerTest.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEngine;

+
 [TestFixture]
 public class PersistentDataTests
 {
@@ -145,7 +146,7 @@ public class PersistentDataTests
    [Test]
    public void Test_PersistentDataController_Version()
    {
-        const int VERSION = 0x04_01;
+        const int VERSION = 0x04_03;
        Assert.AreEqual(VERSION, PersistentDataController.VERSION);
    }

@@ -611,4 +612,158 @@ public class PersistentDataTests
        c.Set<int>("key", 123);
        Assert.IsFalse(c.Has("KEY"));
    }
+
+    [Test]
+    public void Test_AddLearnable_AddsLearnable()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        bool added = progress.AddLearnable("test learnable", 0);
+
+        Assert.IsTrue(added);
+        Assert.AreEqual(progress.learnables.Count, 1);
+        Assert.AreEqual(progress.learnables[0].name, "test learnable");
+        Assert.AreEqual(progress.learnables[0].index, 0);
+    }
+
+    [Test]
+    public void Test_AddLearnable_FailsWithDuplicateName()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        progress.AddLearnable("test learnable", 0);
+
+        bool added = progress.AddLearnable("test learnable", 1);
+
+        Assert.IsFalse(added);
+        Assert.AreEqual(progress.learnables.Count, 1);
+    }
+
+    [Test]
+    public void Test_AddLearnable_FailsWithDuplicateIndex()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        progress.AddLearnable("test learnable", 0);
+
+        bool added = progress.AddLearnable("test learnable 2", 0);
+
+        Assert.IsFalse(added);
+        Assert.AreEqual(progress.learnables.Count, 1);
+    }
+
+
+    [Test]
+    public void Test_UpdateLearnable_UpdatesProgress()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        progress.AddLearnable("test learnable", 0);
+
+        progress.UpdateLearnable("test learnable", 3.0f);
+
+        Assert.AreEqual(progress.learnables[0].progress, 3.0f);
+    }
+
+    [Test]
+    public void Test_UpdateLearnable_CropsProgressAtFive()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        progress.AddLearnable("test learnable", 0);
+
+        progress.UpdateLearnable("test learnable", 10.0f);
+
+        Assert.AreEqual(progress.learnables[0].progress, 5.0f);
+        Assert.AreEqual(progress.completedLearnables, 1);
+    }
+
+    [Test]
+    public void Test_UpdateLearnable_CropsProgressAtNegativeFive()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        progress.AddLearnable("test learnable", 0);
+
+        progress.UpdateLearnable("test learnable", -10.0f);
+
+        Assert.AreEqual(progress.learnables[0].progress, -5.0f);
+    }
+
+    [Test]
+    public void Test_FindLearnable_ReturnsNullWhenNotFound()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+        progress.AddLearnable("test learnable 1", 0);
+        progress.AddLearnable("test learnable 2", 1);
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.FindLearnable("not found");
+
+        Assert.IsNull(learnable);
+    }
+
+    [Test]
+    public void Test_FindLearnable_ReturnsLearnableByName()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+        progress.AddLearnable("test learnable 1", 0);
+        progress.AddLearnable("test learnable 2", 1);
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.FindLearnable("test learnable 2");
+
+        Assert.AreEqual(learnable.index, 1);
+    }
+
+    [Test]
+    public void Test_AddNewLearnable_ReturnsFalseWhenNoUnusedLearnables()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+        progress.AddLearnable("test learnable 1", 0);
+        progress.learnables[0].inUse = true;
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.AddNewLearnable();
+
+        Assert.IsNull(learnable);
+    }
+
+    [Test]
+    public void Test_AddNewLearnable_ReturnsTrueWhenUnusedLearnableFound()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+        progress.AddLearnable("test learnable 1", 0);
+        progress.AddLearnable("test learnable 2", 1);
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.AddNewLearnable();
+
+        Assert.IsNotNull(learnable);
+        Assert.AreEqual(progress.inUseLearnables, 1);
+    }
+
+    [Test]
+    public void Test_GetRandomLearnable_ReturnsNullWhenNoLearnables()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.GetRandomLearnable();
+
+        Assert.IsNull(learnable);
+    }
+
+    [Test]
+    public void Test_GetRandomLearnable_ReturnsNullWhenOnlyCompletedLearnables()
+    {
+        PersistentDataController.SavedCourseProgress progress = new PersistentDataController.SavedCourseProgress();
+        progress.AddLearnable("test learnable 1", 0);
+        progress.AddLearnable("test learnable 2", 1);
+        progress.learnables[0].progress = 4.0f;
+        progress.learnables[0].inUse = true;
+        progress.learnables[1].progress = 4.0f;
+        progress.learnables[1].inUse = true;
+        progress.completedLearnables = 2;
+        progress.inUseLearnables = 0;
+
+        PersistentDataController.SavedLearnableProgress learnable = progress.GetRandomLearnable();
+
+        Assert.IsNull(learnable);
+    }
 }
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -149,7 +149,15 @@ PlayerSettings:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
-  - {fileID: 11400000, guid: 04c0ccfeb1b80884fae8ac57e1d73d35, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1