diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme
new file mode 100644
index 0000000..a7f8590
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D_01_AnimatedSprite"
+               BuildableName = "2D_01_AnimatedSprite"
+               BlueprintName = "2D_01_AnimatedSprite"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2D_01_AnimatedSprite"
+            BuildableName = "2D_01_AnimatedSprite"
+            BlueprintName = "2D_01_AnimatedSprite"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2D_01_AnimatedSprite"
+            BuildableName = "2D_01_AnimatedSprite"
+            BlueprintName = "2D_01_AnimatedSprite"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/2D_JRPG.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/2D_JRPG.xcscheme
index 232b370..4ee03fb 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/2D_JRPG.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/2D_JRPG.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/2D_Pong.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/2D_Pong.xcscheme
index 0012c51..fa2e6f8 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/2D_Pong.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/2D_Pong.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/3D_01_RotatingCube.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/3D_01_RotatingCube.xcscheme
index 96c5d66..02fbe70 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/3D_01_RotatingCube.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/3D_01_RotatingCube.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/3D_02_SkinnedCharacter.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/3D_02_SkinnedCharacter.xcscheme
index 3331a3e..aa20d3f 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/3D_02_SkinnedCharacter.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/3D_02_SkinnedCharacter.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/3D_03_MousePicking.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/3D_03_MousePicking.xcscheme
index 2c43aa1..912ab77 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/3D_03_MousePicking.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/3D_03_MousePicking.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/3D_FirstPerson.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/3D_FirstPerson.xcscheme
index db581e7..0fa4103 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/3D_FirstPerson.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/3D_FirstPerson.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/G_01_UserInput.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/G_01_UserInput.xcscheme
new file mode 100644
index 0000000..a5716c0
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/G_01_UserInput.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "G_01_UserInput"
+               BuildableName = "G_01_UserInput"
+               BlueprintName = "G_01_UserInput"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_01_UserInput"
+            BuildableName = "G_01_UserInput"
+            BlueprintName = "G_01_UserInput"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_01_UserInput"
+            BuildableName = "G_01_UserInput"
+            BlueprintName = "G_01_UserInput"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme
new file mode 100644
index 0000000..2ad9b28
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "G_02_MultipleWindows"
+               BuildableName = "G_02_MultipleWindows"
+               BlueprintName = "G_02_MultipleWindows"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_02_MultipleWindows"
+            BuildableName = "G_02_MultipleWindows"
+            BlueprintName = "G_02_MultipleWindows"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_02_MultipleWindows"
+            BuildableName = "G_02_MultipleWindows"
+            BlueprintName = "G_02_MultipleWindows"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/G_03_SavingState.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/G_03_SavingState.xcscheme
new file mode 100644
index 0000000..6276abf
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/G_03_SavingState.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "G_03_SavingState"
+               BuildableName = "G_03_SavingState"
+               BlueprintName = "G_03_SavingState"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_03_SavingState"
+            BuildableName = "G_03_SavingState"
+            BlueprintName = "G_03_SavingState"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "G_03_SavingState"
+            BuildableName = "G_03_SavingState"
+            BlueprintName = "G_03_SavingState"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/GateEngineDemos-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/GateEngineDemos-Package.xcscheme
index 1460661..df24a36 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/GateEngineDemos-Package.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/GateEngineDemos-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -146,6 +146,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "G_04_UserInterface"
+               BuildableName = "G_04_UserInterface"
+               BlueprintName = "G_04_UserInterface"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Package.swift b/Package.swift
index d873f23..98e42d2 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.10
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -19,9 +19,6 @@ let swiftSettings: [SwiftSetting] = [
 ]
 
 let linkerSettings: [LinkerSetting] = [
-    // Strip dead code in release builds
-    .unsafeFlags(["-dead_strip"], .when(platforms: [.windows, .macOS, .linux, .iOS, .tvOS], configuration: .release)),
-
     // These flags tell Windows that the executable is UI based (shows a window) and hides the command prompt
     .unsafeFlags(["-Xlinker", "/SUBSYSTEM:WINDOWS"], .when(platforms: [.windows], configuration: .release)),
 ]
@@ -44,7 +41,8 @@ let package: Package = Package(
         .executable(name: "G_03_SavingState", targets: ["G_03_SavingState"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/STREGAsGate/GateEngine.git", .upToNextMajor(from: "0.1.0")),
+        .package(url: "https://github.com/STREGAsGate/GateEngine.git", branch: "Release-0.2"),
+        .package(url: "https://github.com/swiftwasm/carton", from: "1.0.0"),
     ],
     targets: [
         .executableTarget(name: "2D_01_AnimatedSprite",
diff --git a/Sources/2D_01_AnimatedSprite/AnimatedSprite.swift b/Sources/2D_01_AnimatedSprite/AnimatedSprite.swift
index 899ca25..ebea1f1 100644
--- a/Sources/2D_01_AnimatedSprite/AnimatedSprite.swift
+++ b/Sources/2D_01_AnimatedSprite/AnimatedSprite.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
@@ -58,7 +58,7 @@ class AnimatedSpriteSystem: System {
             component.spriteSize = Size2(width: 32, height: 32)
             
             // load the SpriteSheet from a png file
-            component.spriteSheet = SpriteSheet(path: "Resources/Earth rotating 32 x 32.png")
+            component.spriteSheet = SpriteSheet(path: "Resources/Earth rotating 32 x 32.png", sizeHint: Size2(32))
             
             // create an animation that plays at 60fps,
             // we could also create the animation with an explicit duration
diff --git a/Sources/2D_JRPG/JRPG.swift b/Sources/2D_JRPG/JRPG.swift
index e7c1252..83fe154 100644
--- a/Sources/2D_JRPG/JRPG.swift
+++ b/Sources/2D_JRPG/JRPG.swift
@@ -179,7 +179,7 @@ final class RoomLoadingSystem: System {
                 )
                 // Give the player the spawn animation index
                 // This will change which direction the player is facing
-                player[SpriteComponent.self].activeAnimationIndex = activeAnimationIndex
+                player[SpriteComponent.self].setAnimation(activeAnimationIndex)
             }
             // Move to the next loading phase
             phase = .waitForRoomToLoad
@@ -329,7 +329,7 @@ final class RoomSystem: System {
                     // Get the first argument which we expect to be a Swift.Int
                     // Set the Int as the players active animation
                     // This will change the direction the player is facing
-                    player[SpriteComponent.self].activeAnimationIndex = args[0].getInt()
+                    player[SpriteComponent.self].setAnimation(args[0].getInt())
                 }
             }
             
@@ -590,23 +590,23 @@ enum Player {
             // Check for inputs and move the character in the approproite direction
             if input.keyboard.anyKeyIsPressed(in: ["a", .left]) || input.gamePads.any.dpad.left.isPressed {
                 // Use the left facing animation
-                entity[SpriteComponent.self].activeAnimationIndex = 2
+                entity[SpriteComponent.self].setAnimation(2)
                 // Move the character left
                 entity[Physics2DComponent.self].velocity = Size2(Direction2.left) * 0.01
             }else if input.keyboard.anyKeyIsPressed(in: ["d", .right]) || input.gamePads.any.dpad.right.isPressed {
                 // Use the right facing animation
-                entity[SpriteComponent.self].activeAnimationIndex = 3
+                entity[SpriteComponent.self].setAnimation(3)
                 // Move the character right
                 entity[Physics2DComponent.self].velocity = Size2(Direction2.right) * 0.01
             }else if input.keyboard.anyKeyIsPressed(in: ["w", .up]) || input.gamePads.any.dpad.up.isPressed {
                 // Use the up facing animation
-                entity[SpriteComponent.self].activeAnimationIndex = 0
+                entity[SpriteComponent.self].setAnimation(0)
                 // Move the character up.
                 // We negate the value becuse the top of the screen is the origin, so subtracting will go up.
                 entity[Physics2DComponent.self].velocity = Size2(-Direction2.up) * 0.01
             }else if input.keyboard.anyKeyIsPressed(in: ["s", .down]) || input.gamePads.any.dpad.down.isPressed {
                 // Use the down facing animation
-                entity[SpriteComponent.self].activeAnimationIndex = 1
+                entity[SpriteComponent.self].setAnimation(1)
                 // We negate the value becuse the top of the screen is the origin, so subtracting will go down.
                 entity[Physics2DComponent.self].velocity = Size2(-Direction2.down) * 0.01
             }else{
diff --git a/Sources/2D_Pong/Pong.swift b/Sources/2D_Pong/Pong.swift
index e5b815e..53ddfbc 100644
--- a/Sources/2D_Pong/Pong.swift
+++ b/Sources/2D_Pong/Pong.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Sources/3D_01_RotatingCube/RotatingCube.swift b/Sources/3D_01_RotatingCube/RotatingCube.swift
index 21a4f3d..0085633 100644
--- a/Sources/3D_01_RotatingCube/RotatingCube.swift
+++ b/Sources/3D_01_RotatingCube/RotatingCube.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Sources/3D_02_SkinnedCharacter/SkinnedCharacter.swift b/Sources/3D_02_SkinnedCharacter/SkinnedCharacter.swift
index 12f5ed6..d8c114f 100644
--- a/Sources/3D_02_SkinnedCharacter/SkinnedCharacter.swift
+++ b/Sources/3D_02_SkinnedCharacter/SkinnedCharacter.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
@@ -16,7 +16,7 @@ final class SkinnedCharacterGameDelegate: GameDelegate {
     // didFinishLaunching() is executed immediatley after the game is ready to start
     func didFinishLaunching(game: Game, options: LaunchOptions) async {
         // Add the engine provided RigSystem so our character can animate
-        game.insertSystem(RigSystem.self)
+        game.insertSystem(Rig3DSystem.self)
         
         // Add the skinned character update system to the game. System implementation is below
         game.insertSystem(SkinnedCharacterSystem.self)
@@ -72,17 +72,16 @@ class SkinnedCharacterSystem: System {
         }
         
         // Give the entity rig
-        await character.configure(Rig3DComponent.self) { component in
+        character.insert(Rig3DComponent.self) { component in
             
             // Load the characters skeleton from the characters source file
-            component.skeleton = try! await Skeleton(path: "Resources/Cat.glb")
+            component.skeleton = Skeleton(path: "Resources/Cat.glb")
             
             // Load an animation set from the characters source file
-            let animations = [try! await SkeletalAnimation(path: "Resources/Cat.glb")]
-            component.animationSet = animations
+            component.animationSet = [SkeletalAnimation(path: "Resources/Cat.glb")]
             
             // Convert the first skeletal animation into a repeating rig animation
-            component.activeAnimation = Rig3DComponent.Animation(animations[0], repeats: true)
+            component.activeAnimation = Rig3DAnimation(component.animationSet![0], repeats: true)
         }
         
         // Give the entity 3D geometry
diff --git a/Sources/3D_03_MousePicking/MousePicking.swift b/Sources/3D_03_MousePicking/MousePicking.swift
index deb76b2..9c478ca 100644
--- a/Sources/3D_03_MousePicking/MousePicking.swift
+++ b/Sources/3D_03_MousePicking/MousePicking.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Sources/3D_FirstPerson/FirstPerson.swift b/Sources/3D_FirstPerson/FirstPerson.swift
index 7095c3f..8cf9b61 100644
--- a/Sources/3D_FirstPerson/FirstPerson.swift
+++ b/Sources/3D_FirstPerson/FirstPerson.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
@@ -138,7 +138,7 @@ class PlayerControllerSystem: System {
         // Give the player a collision component so we can collide with the world
         player.insert(Collision3DComponent.self) { component in
             // Dynamic collision is for objects that move and can be moved
-            component.kind = .dynamic
+            component.kind = .dynamic(0)
             // Robust protection applies a more expensiove collision check
             // This helps reduce the chance of an entity passing through a wall
             // Use this option for entites that move with controls or move at higher speeds
diff --git a/Sources/G_01_UserInput/UserInput.swift b/Sources/G_01_UserInput/UserInput.swift
index fb1913f..a5fcbc4 100644
--- a/Sources/G_01_UserInput/UserInput.swift
+++ b/Sources/G_01_UserInput/UserInput.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Sources/G_02_MultipleWindows/MultipleWindows.swift b/Sources/G_02_MultipleWindows/MultipleWindows.swift
index 0c483d9..ad97e2f 100644
--- a/Sources/G_02_MultipleWindows/MultipleWindows.swift
+++ b/Sources/G_02_MultipleWindows/MultipleWindows.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Sources/G_03_SavingState/SavingState.swift b/Sources/G_03_SavingState/SavingState.swift
index ab5be30..d4bb7d1 100644
--- a/Sources/G_03_SavingState/SavingState.swift
+++ b/Sources/G_03_SavingState/SavingState.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Dustin Collins (Strega's Gate)
+ * Copyright © 2023-2024 Dustin Collins (Strega's Gate)
  * All Rights Reserved.
  *
  * http://stregasgate.com
diff --git a/Xcode/GateEngineDemos.xcodeproj/project.pbxproj b/Xcode/GateEngineDemos.xcodeproj/project.pbxproj
index 9086656..2695403 100644
--- a/Xcode/GateEngineDemos.xcodeproj/project.pbxproj
+++ b/Xcode/GateEngineDemos.xcodeproj/project.pbxproj
@@ -22,13 +22,14 @@
 /* Begin PBXFileReference section */
 		5677A8532A27999E00BD0456 /* 01_UserInput.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 01_UserInput.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		5677A85A2A27999F00BD0456 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		5677A8652A279C1000BD0456 /* UserInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserInput.swift; path = ../../Sources/_01_UserInput/UserInput.swift; sourceTree = "<group>"; };
+		5677A8652A279C1000BD0456 /* UserInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserInput.swift; path = ../../Sources/G_01_UserInput/UserInput.swift; sourceTree = "<group>"; };
 		5677A8682A279C4200BD0456 /* GateEngineDemos */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = GateEngineDemos; path = ..; sourceTree = "<group>"; };
 		569C5E652A32C58C009CC52B /* 02_MultipleWindows.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 02_MultipleWindows.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		569C5E662A32C5A2009CC52B /* MultipleWindows.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MultipleWindows.swift; path = ../../Sources/_02_MultipleWindows/MultipleWindows.swift; sourceTree = "<group>"; };
+		569C5E662A32C5A2009CC52B /* MultipleWindows.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MultipleWindows.swift; path = ../../Sources/G_02_MultipleWindows/MultipleWindows.swift; sourceTree = "<group>"; };
 		56D155552A2A490200FDB7AC /* 2D_01_AnimatedSprite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2D_01_AnimatedSprite.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		56D155572A2A492B00FDB7AC /* AnimatedSprite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimatedSprite.swift; path = ../Sources/2D_01_AnimatedSprite/AnimatedSprite.swift; sourceTree = "<group>"; };
 		56D155592A2A493500FDB7AC /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Resources; path = ../Sources/2D_01_AnimatedSprite/Resources; sourceTree = "<group>"; };
+		56D23EE92B44F36600873FC1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,9 +63,10 @@
 		5677A84A2A27999E00BD0456 = {
 			isa = PBXGroup;
 			children = (
+				56D23EE92B44F36600873FC1 /* README.md */,
 				56D155472A2A487800FDB7AC /* Shared */,
-				5677A8552A27999E00BD0456 /* 01_UserInput */,
-				56A7EEF52A32C55D00D4FAA0 /* 02_MultipleWindows */,
+				5677A8552A27999E00BD0456 /* G_01_UserInput */,
+				56A7EEF52A32C55D00D4FAA0 /* G_02_MultipleWindows */,
 				56D155482A2A48ED00FDB7AC /* 2D_01_AnimatedSprite */,
 				5677A8672A279C4200BD0456 /* Packages */,
 				5677A8542A27999E00BD0456 /* Products */,
@@ -81,12 +83,12 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		5677A8552A27999E00BD0456 /* 01_UserInput */ = {
+		5677A8552A27999E00BD0456 /* G_01_UserInput */ = {
 			isa = PBXGroup;
 			children = (
 				5677A8652A279C1000BD0456 /* UserInput.swift */,
 			);
-			path = 01_UserInput;
+			path = G_01_UserInput;
 			sourceTree = "<group>";
 		};
 		5677A8672A279C4200BD0456 /* Packages */ = {
@@ -97,12 +99,12 @@
 			name = Packages;
 			sourceTree = "<group>";
 		};
-		56A7EEF52A32C55D00D4FAA0 /* 02_MultipleWindows */ = {
+		56A7EEF52A32C55D00D4FAA0 /* G_02_MultipleWindows */ = {
 			isa = PBXGroup;
 			children = (
 				569C5E662A32C5A2009CC52B /* MultipleWindows.swift */,
 			);
-			path = 02_MultipleWindows;
+			path = G_02_MultipleWindows;
 			sourceTree = "<group>";
 		};
 		56D155472A2A487800FDB7AC /* Shared */ = {
@@ -193,7 +195,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1430;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				TargetAttributes = {
 					5677A8522A27999E00BD0456 = {
 						CreatedOnToolsVersion = 14.3;
@@ -319,11 +321,13 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 8TX6RJQV9M;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -355,6 +359,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.STREGAsGate.GateEngineDemos.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -409,11 +414,13 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 8TX6RJQV9M;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = fast;
@@ -439,6 +446,7 @@
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
+				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.STREGAsGate.GateEngineDemos.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -446,6 +454,7 @@
 				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
diff --git a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme
index dfa9126..5b28a20 100644
--- a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme
+++ b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/2D_01_AnimatedSprite.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_01_UserInput.xcscheme b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_01_UserInput.xcscheme
index b75581d..0384bd8 100644
--- a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_01_UserInput.xcscheme
+++ b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_01_UserInput.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme
index 34a7f8d..0dcce81 100644
--- a/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme
+++ b/Xcode/GateEngineDemos.xcodeproj/xcshareddata/xcschemes/G_02_MultipleWindows.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Xcode/README.md b/Xcode/README.md
new file mode 100644
index 0000000..a51fa3c
--- /dev/null
+++ b/Xcode/README.md
@@ -0,0 +1,7 @@
+#  About Xcode Projects
+
+These Xcode projects contain references to the actual swift files and respource folders located in the GateEngineDemos package. Nothing is a "Copy".
+
+Xcode does not have the ability to live update references folders of source code or respurces. Becuase of this it is strongly recommended that you develop your game as a package first, then make it work with an Xcode project later.
+
+Alternatively, you can develop your game as a swift package library. You can then import that library in both a package executable and in an Xcode project target. When doing it this way Xcode will live update as you edit the library.