diff --git a/LyraStarterGame/Content/Characters/Character_Default.uasset b/LyraStarterGame/Content/Characters/Character_Default.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0f704572d6cfd74a928fd567b819b648e17f49fc
Binary files /dev/null and b/LyraStarterGame/Content/Characters/Character_Default.uasset differ
diff --git a/LyraStarterGame/Content/ContextEffects/DT_AnimEffectTags.uasset b/LyraStarterGame/Content/ContextEffects/DT_AnimEffectTags.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0a69cc137f78c9b91226524d3d3ebba0952b00e3
Binary files /dev/null and b/LyraStarterGame/Content/ContextEffects/DT_AnimEffectTags.uasset differ
diff --git a/LyraStarterGame/Content/ContextEffects/DT_SurfaceTypes.uasset b/LyraStarterGame/Content/ContextEffects/DT_SurfaceTypes.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cac823ed818623cb0a86f32afcfec7ab5ebb9242
Binary files /dev/null and b/LyraStarterGame/Content/ContextEffects/DT_SurfaceTypes.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/GCNL_Test_Looping.uasset b/LyraStarterGame/Content/GameplayCueNotifies/GCNL_Test_Looping.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..23af0b1c2f5c88b5a3b7c55c4be9632f4a0a2ccc
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/GCNL_Test_Looping.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/GCN_Character_Heal.uasset b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Character_Heal.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f5a9b79e4a0802421d06203fb8af44719dab0bbf
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Character_Heal.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_Burst.uasset b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_Burst.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..88e80328c9070fb83bc635433c071d51d3393c34
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_Burst.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_BurstLatent.uasset b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_BurstLatent.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9db4dcf8c4239b1cacf0bfcc1e2884fbff8fe4fe
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Test_BurstLatent.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/GCN_Weapon_Impact.uasset b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Weapon_Impact.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..627c2c40078f59e773aa28bede5126a0946d5c02
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/GCN_Weapon_Impact.uasset differ
diff --git a/LyraStarterGame/Content/GameplayCueNotifies/I_GameplayCueWidget.uasset b/LyraStarterGame/Content/GameplayCueNotifies/I_GameplayCueWidget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cf492a571b27591ae34fa145634e8d0fac7eee2b
Binary files /dev/null and b/LyraStarterGame/Content/GameplayCueNotifies/I_GameplayCueWidget.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_BlockAbilityInput.uasset b/LyraStarterGame/Content/GameplayEffects/GE_BlockAbilityInput.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..26992657da44ebebc5861211f7531f3ae8997fcb
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_BlockAbilityInput.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_DynamicTag.uasset b/LyraStarterGame/Content/GameplayEffects/GE_DynamicTag.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ae44c75e65badcde54477292415b7886d6067885
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_DynamicTag.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Burst.uasset b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Burst.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e9a0a8075f194a59b3d7b1914fda999997a00737
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Burst.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_BurstLatent.uasset b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_BurstLatent.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1ba3c1435223e1ac0af04320c3388f30f85e1071
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_BurstLatent.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Looping.uasset b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Looping.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..acb879f2108d33d912a6beb4d0d6f0f989b727ec
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_GameplayCueTest_Looping.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_HeroDash_Cooldown.uasset b/LyraStarterGame/Content/GameplayEffects/GE_HeroDash_Cooldown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6c5cb47a30177b3ff8cf955cc83b85d6ff61a0f5
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_HeroDash_Cooldown.uasset differ
diff --git a/LyraStarterGame/Content/GameplayEffects/GE_IsPlayer.uasset b/LyraStarterGame/Content/GameplayEffects/GE_IsPlayer.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5c738704ce2cb77fe101b4d01d70f59ecde60439
Binary files /dev/null and b/LyraStarterGame/Content/GameplayEffects/GE_IsPlayer.uasset differ
diff --git a/LyraStarterGame/Content/Input/InputData_Hero.uasset b/LyraStarterGame/Content/Input/InputData_Hero.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8c5950fc14bbbcd357998939ea45575b413d2746
Binary files /dev/null and b/LyraStarterGame/Content/Input/InputData_Hero.uasset differ
diff --git a/LyraStarterGame/Content/Input/InputData_SimplePawn.uasset b/LyraStarterGame/Content/Input/InputData_SimplePawn.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..41889cd31c328d6c0be94aba95d7486d3214dbaa
Binary files /dev/null and b/LyraStarterGame/Content/Input/InputData_SimplePawn.uasset differ
diff --git a/LyraStarterGame/Content/PhysicsMaterials/PM_Character.uasset b/LyraStarterGame/Content/PhysicsMaterials/PM_Character.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..64916ae4221f47dcb7e48aa9251fc84a1e09743e
Binary files /dev/null and b/LyraStarterGame/Content/PhysicsMaterials/PM_Character.uasset differ
diff --git a/LyraStarterGame/Content/PhysicsMaterials/PM_Concrete.uasset b/LyraStarterGame/Content/PhysicsMaterials/PM_Concrete.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8c9b7388184699fa03a8a4cf6063734655e14a88
Binary files /dev/null and b/LyraStarterGame/Content/PhysicsMaterials/PM_Concrete.uasset differ
diff --git a/LyraStarterGame/Content/PhysicsMaterials/PM_Glass.uasset b/LyraStarterGame/Content/PhysicsMaterials/PM_Glass.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..601aca5fb671e34fe59a97eda862a23d12f717ed
Binary files /dev/null and b/LyraStarterGame/Content/PhysicsMaterials/PM_Glass.uasset differ
diff --git a/LyraStarterGame/Content/System/TransitionMap.umap b/LyraStarterGame/Content/System/TransitionMap.umap
new file mode 100644
index 0000000000000000000000000000000000000000..61081b506adc18a425d8063405b18d931a4ec674
Binary files /dev/null and b/LyraStarterGame/Content/System/TransitionMap.umap differ
diff --git a/LyraStarterGame/Content/Tools/Enum_PanelType.uasset b/LyraStarterGame/Content/Tools/Enum_PanelType.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..dc611c117f776cc983e7ea870830c0214734e6c9
Binary files /dev/null and b/LyraStarterGame/Content/Tools/Enum_PanelType.uasset differ
diff --git a/LyraStarterGame/Content/Tools/Enum_RailingConstructionType.uasset b/LyraStarterGame/Content/Tools/Enum_RailingConstructionType.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..991f7b66c24e76a2c5152407545d7d8729d9f0cf
Binary files /dev/null and b/LyraStarterGame/Content/Tools/Enum_RailingConstructionType.uasset differ
diff --git a/LyraStarterGame/Content/Tools/Enum_RotationAxis.uasset b/LyraStarterGame/Content/Tools/Enum_RotationAxis.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d59342128275f88796188ce331df570fcabb4352
Binary files /dev/null and b/LyraStarterGame/Content/Tools/Enum_RotationAxis.uasset differ
diff --git a/LyraStarterGame/Content/Tools/Enum_StairConstructionType.uasset b/LyraStarterGame/Content/Tools/Enum_StairConstructionType.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b58aa4d04d02f4311a6f8d654514c133d45a34c5
Binary files /dev/null and b/LyraStarterGame/Content/Tools/Enum_StairConstructionType.uasset differ
diff --git a/LyraStarterGame/Content/Tools/Enum_WindowType.uasset b/LyraStarterGame/Content/Tools/Enum_WindowType.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..97ac23fa77cf1c6eacc74e397520472128e74881
Binary files /dev/null and b/LyraStarterGame/Content/Tools/Enum_WindowType.uasset differ
diff --git a/LyraStarterGame/Content/Tools/MT_PanelCenterDefault.uasset b/LyraStarterGame/Content/Tools/MT_PanelCenterDefault.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a781ec64d1d254d653c96d457017ac01a5e33c90
Binary files /dev/null and b/LyraStarterGame/Content/Tools/MT_PanelCenterDefault.uasset differ
diff --git a/LyraStarterGame/Content/Tools/MT_PanelCornerDefault.uasset b/LyraStarterGame/Content/Tools/MT_PanelCornerDefault.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e986ace2d172e465dd981efdc52657bd5b540d3c
Binary files /dev/null and b/LyraStarterGame/Content/Tools/MT_PanelCornerDefault.uasset differ
diff --git a/LyraStarterGame/Content/Tools/MT_RailingDefaultMaterial.uasset b/LyraStarterGame/Content/Tools/MT_RailingDefaultMaterial.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..11cd828ce135922309274a22d20ad83f1e52eb15
Binary files /dev/null and b/LyraStarterGame/Content/Tools/MT_RailingDefaultMaterial.uasset differ
diff --git a/LyraStarterGame/Content/Tools/MT_StairDefaultMaterial.uasset b/LyraStarterGame/Content/Tools/MT_StairDefaultMaterial.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..89dfc70db7bc07bb1b8351170780098ae8cf5ffa
Binary files /dev/null and b/LyraStarterGame/Content/Tools/MT_StairDefaultMaterial.uasset differ
diff --git a/LyraStarterGame/Content/Tools/SM_StairStep.uasset b/LyraStarterGame/Content/Tools/SM_StairStep.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f26a74e0a7a96a8e68f64825eee54d28d079698f
Binary files /dev/null and b/LyraStarterGame/Content/Tools/SM_StairStep.uasset differ
diff --git a/LyraStarterGame/Content/Tools/SM_StairStep100.uasset b/LyraStarterGame/Content/Tools/SM_StairStep100.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..456dc7cff39b7e0dc3bfac989f44a9580eab7788
Binary files /dev/null and b/LyraStarterGame/Content/Tools/SM_StairStep100.uasset differ
diff --git a/LyraStarterGame/Content/UI/B_CommonInputData.uasset b/LyraStarterGame/Content/UI/B_CommonInputData.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..83d6b61549486406e6b56ceb194f44c7a7a28357
Binary files /dev/null and b/LyraStarterGame/Content/UI/B_CommonInputData.uasset differ
diff --git a/LyraStarterGame/Content/UI/B_LyraFrontendStateComponent.uasset b/LyraStarterGame/Content/UI/B_LyraFrontendStateComponent.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d503801b2d4e5b9c2205e25cb8e75ab3dde8fbac
Binary files /dev/null and b/LyraStarterGame/Content/UI/B_LyraFrontendStateComponent.uasset differ
diff --git a/LyraStarterGame/Content/UI/B_LyraUIPolicy.uasset b/LyraStarterGame/Content/UI/B_LyraUIPolicy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..99a7f78eb34ecb73aa360c500ef7498b2388e34c
Binary files /dev/null and b/LyraStarterGame/Content/UI/B_LyraUIPolicy.uasset differ
diff --git a/LyraStarterGame/Content/UI/DT_UniversalActions.uasset b/LyraStarterGame/Content/UI/DT_UniversalActions.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bcc361197acedc9941276737ad183b00431f8703
Binary files /dev/null and b/LyraStarterGame/Content/UI/DT_UniversalActions.uasset differ
diff --git a/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Clear.uasset b/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Clear.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0dc0ffe0ddbca7347154b5422c1adbc5fa368505
Binary files /dev/null and b/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Clear.uasset differ
diff --git a/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Primary-M.uasset b/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Primary-M.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..67727c42463e5ed553f7acec225b3ce87fb7a47e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Foundation/Buttons/ButtonStyle-Primary-M.uasset differ
diff --git a/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationDefault.uasset b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationDefault.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..de0fda16f5161695dbb69e5d5b6c576bafa4c6f4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationDefault.uasset differ
diff --git a/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationError.uasset b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationError.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c0e8de2773484e72cf3f31c87aaaac6d89dae866
Binary files /dev/null and b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ConfirmationError.uasset differ
diff --git a/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ControllerDisconnected.uasset b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ControllerDisconnected.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..41401d74c7e67b072f1365dc5690f5de9d83289a
Binary files /dev/null and b/LyraStarterGame/Content/UI/Foundation/Dialogs/W_ControllerDisconnected.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarFill.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarFill.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..084ff3928787205f51ad7712eec8b7b0884433fd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarFill.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..edcaf770cef09a5c5063b73a26cb7d917e16e2a0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow_Boost.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow_Boost.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ab27df8dccffec8fbba5672b8c2696aadd3c7e88
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_BarGlow_Boost.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_OuterRing.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_OuterRing.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1219c855b7767dfdb6c610abe14e6b64823d71a6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Dash_OuterRing.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameColor.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameColor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4417e27024b710956279ccaf3c4270160b770355
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameColor.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameGlow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..807d7de8f3dabcaa5479b4e3decc2d448d9181ff
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_NameGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_Shadow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_Shadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0db30304903a19c24d6f3d58da9b53c1bc357ad0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_ElimFeed_Shadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_BarBorder.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_BarBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c04422ae3e87d6ba853682b0d14d6eab76697351
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_BarBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Fill.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Fill.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f9f2fb17db8548fab3ebf9e416fcb1b063e91383
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Fill.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Glow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8ba5cb21c9e65a44f5df9b129e52ff9038b226f3
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_NumberBorder.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_NumberBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5a058c80da363196a301efbd988ba44059ca33ca
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_NumberBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Shadow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Shadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..73336c9a6f46a3d808deaaa1ed6049e5d89c9b72
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_HealthBar_Shadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Card.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Card.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e3e5c2eb60b8da42652688512cb9f736c8f22213
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Card.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Counter.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Counter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5309b08e4f8fe4c543dc9f2bfd2924facf0f0dfd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_Ammo_Counter.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Grenade.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..78880182d7bb16a187ab275b19aa14759b23a777
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Grenade.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Melee.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..65c6a8bfd481ccac39445ea9c03384bdeb468a12
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Melee.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Pistol.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a3aae6d70bfa8c9c0c9d8d5c78b505d2a28b83da
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Rifle.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ad0dcb05dcd274ddbc2b79971b100aa0a9fa1f6c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_SelfElimination.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_SelfElimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..319709d7ce3981e342cc99ffb12edc64fa9a2532
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_SelfElimination.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Shotgun.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..df1ead41f40816bb39c430beb55fa2e25d61c46c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Icon_ElimFeed_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_AmmoCounterBorder.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_AmmoCounterBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6641e7b7e3535b0ab93f3a686b63bac5970c74bc
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_AmmoCounterBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..098088486db0a5c9ff72d74a1f33fc1b9e7b6b59
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border_Square.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border_Square.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..76f5806a627e77ee953f4b20acf223694d67997c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_QuickBar_Border_Square.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..08e8360ee6c20c8b29111cc780d6df8ea9aeceb6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Glow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ab63d4d847a2ca94d9b71371ab6ab0b37a4063c1
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Shadow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Shadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9d72d3c601640ad54b0764901db18ced56aaa2fd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Shadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_SoftGlow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_SoftGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..577ede3a4f9022cb2d01ed7a280ea830f6f87580
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_SoftGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Text.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Text.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..347bfa0fbcbf58f9b78ee521e6d8695e70f86bf0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_RespawnTimer_Text.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_BaseInstance.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_BaseInstance.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bc8b0696ba2a1c565284d6f02af1be779511abdd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_BaseInstance.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Pistol.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a684eebfbdbbae1c74aa261f035aae7b4f10e7d7
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Rifle.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..521fb0364414d3df1e4765b09932d0369deb831c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Shotgun.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b1792d0297d57659d185e6398b50ff2d29598538
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_CrossHair_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_EliminationMarker.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_EliminationMarker.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7aac8c7c06385f174e77f42f9e7ed482a7e4185b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_EliminationMarker.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1fcedabc4e548d76b964706c789bc538c63ae894
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..521943309577e61e89895858b9486fce43ba3926
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation_Critical.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation_Critical.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e1272e3e09361e270cf230735a1dc508285980fe
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarkerConfirmation_Critical.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker_Single.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker_Single.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..61b4949866a5854135a8af89e88d23dd3a517e73
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_HitMarker_Single.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Pistol.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d6b07936b38768877ab6ce7690bb61ead97e37c9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Rifle.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d418e63f57543c5fa5e32170d6d5fddce80f9240
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Shotgun.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3fc7a280a89722092c605f3723834e0f7773e004
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_Outer_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_FourSpread.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_FourSpread.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..15e81215cc76a17da6b50ccf23d01bf84666d70a
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_FourSpread.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_Single.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_Single.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0525b17a7e1df9fb22bff7482a938929d3bc7452
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_Reticles_TargetDot_Single.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Backing.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Backing.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..30d16a03aabf071ffa7835090f3ac75dc1daa367
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Backing.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..41ffeeab57b677111bae6e7b1e9cdbafa295d495
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Enemy.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Enemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0858bbb2586c976501b235cd187b47fafba410af
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Enemy.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2dbf64ebd40ba21e703b64e5dfc67d01a9944314
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow_Enemy.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow_Enemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3b0a936410a4913655e97951b5add5afaf1f8350
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_Glow_Enemy.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..132db8e19efd68c4b807beae98fdca2096ec1abd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow_Enemy.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow_Enemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8bdd0270470981755631af28481b2a7e869acb14
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_BarFill_NumberGlow_Enemy.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Shadow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Shadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..59bb8c4f3e07ecc9e4ef95915d89b23863cbb584
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TeamScore_Shadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_ADS.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_ADS.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..509b008493bdd5ff71d953972fa2781054c27aa8
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_ADS.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Crouch.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Crouch.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..70c945d4bc55f57fa7212987ab3ddbb327ffa2d6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Crouch.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Dash.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Dash.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3ad5255df5c26b6c31d983406413d7f8aa999b88
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Dash.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Emote.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Emote.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9d7f38406f76b7f8255e7b34d7609f10136abcb2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Emote.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Jump.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Jump.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..82bb6f8096ce53dfa89e0c0da2428cf23ee5e47b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Jump.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Melee.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..20a09a67d70cc2d18191c6c2b805ab21515ea216
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_TouchCard_Melee.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_CoolDown_Grenade.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_CoolDown_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d4f4d7ded5b49702758d5ac8914cb17c4e966823
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_CoolDown_Grenade.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..386a95812efe7453ce10f4278491eab4fc79be71
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_Boost.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_Boost.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..dc5926f7cbafcccea86ee660cd28af44e33c82da
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_Boost.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_CoolDown.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_CoolDown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2ea0780ef0e3ea2fa4342354af22746d51bd1909
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_CoolDown.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..48d823de68c373d08debcebd3847c0fc0f3be6cd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton_CoolDown.uasset b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton_CoolDown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ce56d38ad37b1a0c4717dba096dc5c6743e801f5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/MI_UI_WeaponCard_Glow_TouchButton_CoolDown.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_SimpleIcon.uasset b/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_SimpleIcon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..110334419076015f1e8b5e12d3b53ac0f4e2ed5e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_SimpleIcon.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_WeaponCard.uasset b/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_WeaponCard.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..08f7d8ce9302b2ad8d522a6673c4acab88e52497
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/M_UI_Base_WeaponCard.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Effects_TriHalftone_Mask.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Effects_TriHalftone_Mask.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..822fecf75367bbd74c08e17061ee4b939efc3cf3
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Effects_TriHalftone_Mask.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Abilities_Dash.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Abilities_Dash.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..04c9c4b0ccea2bdccf8ad7d7e4b683ba43d820ba
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Abilities_Dash.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_DoubleElimination.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_DoubleElimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0a8d54944b2824a0031cfa2bc47ba472cf1aa2b9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_DoubleElimination.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_QuadrupleElimination.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_QuadrupleElimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d58e0f498809fc4f8eadb2f72a204e026d6713df
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_QuadrupleElimination.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak10.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak10.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3332077cf0bf25c9feb3014f8e2069663971352d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak10.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak15.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak15.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..044eb7bf5bb492ce8220860fbf60ede5140ad259
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak15.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak20.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak20.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..455bccb7ff3c728fd17b6352c1f5cf77edd229b5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak20.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak5.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak5.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2560928b4675a71eff01ab87fc73aeeedfd2d5ae
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_Streak5.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_TripleElimination.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_TripleElimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f9eccd0588ed666deef025091006a6627ed60379
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_Accolade_TripleElimination.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_ADS.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_ADS.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3d48220eb5ef66fca965758cb403570ee4ced7fc
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_ADS.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Crouch.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Crouch.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cd71d109cdc0436f07fa0437f946153be041bf06
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Crouch.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Dash.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Dash.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2b7a6a33399468402644163c4251ec1ac25949e4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Dash.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Emote.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Emote.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..42f8d0824d19b540649e68d7b4af8644ddce1ee6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Emote.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Jump.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Jump.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b5b38ae5fa87e865d5dd65c09680f140b44eb51b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_MobileOnly_Jump.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Grenade.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ee1272239f1323277492e66e521f899ede912971
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Grenade.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Melee.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e79a17b16ce3dccf580491cfcf02e9f68a9ed59
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_Melee.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_SelfElimination.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_SelfElimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3af0fb25dd68364841a94d1c12e09d9e7d7b4ed6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_OtherWeapons_SelfElimination.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ca222140164e109dd3beec701fedefba472fc4c4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol_Ammo.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol_Ammo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..eea03e62de6d4b3e27c4e49482b5315edab70b10
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Pistol_Ammo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..72a92bb25638e8ce28e75f5bfe9f22187af5e487
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle_Ammo.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle_Ammo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4b89120d21c44a73a0774587bfdd0b512c3d375a
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Rifle_Ammo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8914e014004f2657980fe98017bec492edfc6994
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun_Ammo.uasset b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun_Ammo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..890cc8f3114378d1e79af44c9e117e72b3b61817
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Art/T_UI_Icon_RangedWeapons_Shotgun_Ammo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/Textures/T_Crosshair_Dot.uasset b/LyraStarterGame/Content/UI/Hud/Textures/T_Crosshair_Dot.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..40d7a837383b675bdf19d6ab7a9831318246dd42
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/Textures/T_Crosshair_Dot.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_ActionTouchButton_MobileOnly.uasset b/LyraStarterGame/Content/UI/Hud/W_ActionTouchButton_MobileOnly.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0aa7658624e45fcadec88f90497d5925e59e0131
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_ActionTouchButton_MobileOnly.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Left.uasset b/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Left.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2652df5c1b32c0c91092014b29ae9d547c3584c8
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Left.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Right.uasset b/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Right.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5018ca4528998b0edfe27c83cbb07eaa8c73cfa3
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_OnScreenJoystick_Right.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_OpenMenuTouchButton.uasset b/LyraStarterGame/Content/UI/Hud/W_OpenMenuTouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f03bc1ca98147b809ce28bdd184accf4dced5fc7
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_OpenMenuTouchButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Base.uasset b/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0a96d2ff7df8bc00f1ae125079190e3f60af1cd4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Right.uasset b/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Right.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d56dc415a06a46843781735d3c21e35aeae4c9f5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Hud/W_TouchRegion_Right.uasset differ
diff --git a/LyraStarterGame/Content/UI/Indicators/Message_NameplateInfo.uasset b/LyraStarterGame/Content/UI/Indicators/Message_NameplateInfo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..92f2c3a279395d2394a1f753bb15d31fd0c01a85
Binary files /dev/null and b/LyraStarterGame/Content/UI/Indicators/Message_NameplateInfo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Indicators/Message_NameplateRequest.uasset b/LyraStarterGame/Content/UI/Indicators/Message_NameplateRequest.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5287cdd33ac4f557f61b9ba0fa82bab003b44df2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Indicators/Message_NameplateRequest.uasset differ
diff --git a/LyraStarterGame/Content/UI/Indicators/NameplateSource.uasset b/LyraStarterGame/Content/UI/Indicators/NameplateSource.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fec9d0f37833c3047f6d78edf6d309a55280b6c2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Indicators/NameplateSource.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/CA_UI_Frontend.uasset b/LyraStarterGame/Content/UI/Menu/Art/CA_UI_Frontend.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..132e1186d48a4f385a5d744bc283bf4fb2715aa6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/CA_UI_Frontend.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_LoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_LoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4737cb80431c0433770c891814e0261a683c8a4d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_LoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_Logo.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_Logo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c9c8887888536d22634809ee1da3520d63c7cf74
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_Logo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_MapTile.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MapTile.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e61579b7732c5ea60ce9d6c2c11c4c587e707672
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MapTile.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..77922726cee1015bdb0fea377d104663dbd45e1b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3bcede01cc25ef5a7a31f04633df2453190d15c0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_MenuButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_ScrollBar.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_ScrollBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..68992b7472d224429c4825fe60b5e6b7c1de8ec6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_ScrollBar.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamLogos.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamLogos.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d205abde61d6111382a9a6c3c8e52baec6ec8972
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamLogos.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamStripe.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamStripe.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2eb560f85d050f415c60230670c7fc762f6add87
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TeamStripe.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/C_UI_TileArt.uasset b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TileArt.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..340af062b2629c0f7ed0d97b1e61642f909271df
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/C_UI_TileArt.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_BrowserMessageBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_BrowserMessageBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..333f7d279ed2009788a1058f72de49f7eebece2f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_BrowserMessageBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ButtonTileArt.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ButtonTileArt.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..82f0b1ae756edc3034b0b1b7049d0228212348ec
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ButtonTileArt.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownActivatingText.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownActivatingText.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bce07b20c4b04be9d6844d9c7030787adfff06ba
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownActivatingText.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownGlow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6a7df118ac24ef74984ee404da0fd488e3ffee1b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CountdownGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CreditsLogo.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CreditsLogo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..76245e2cc4427d4372b60683081b803d0cb40537
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_CreditsLogo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_DefaultLoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_DefaultLoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0b3c40290fad70643b07831b91bd7e67f360040e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_DefaultLoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..426dcaef9f3fbb1761ecfe7ec804f7568308def3
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base_Ring.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base_Ring.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..550a3b1f8ffb74a3ccce1b4483174113f4f53d6c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceButton_Base_Ring.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceTileArt.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceTileArt.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1400cd85804eb92d8da08d42083c8a7093695ebc
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ExperienceTileArt.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..87343d7c7a0032b4a40abb450f12533e9bfa9757
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton_DebugOnly.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton_DebugOnly.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f5b49beab6ac03b5298694872e39f8ad3185a2c5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_BoundActionButton_DebugOnly.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_CountDownNumbers.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_CountDownNumbers.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7849822b6c7686e0a600e60df6da24a5365e926e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_CountDownNumbers.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_MenuButton.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_MenuButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6df6ee5f84c0f26bf02f9ee61013884c3501f0f5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_MenuButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1ddc23247ea087a5ac9c2bd14c68020e5c9e3e9c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High_Mid.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High_Mid.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3c9610bb384a2483d77511584077ff564107a268
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_High_Mid.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_White.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_White.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..011834233b36e77b8524d56b71f4b10489213f4b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SessionButton_White.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEntry.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEntry.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..78d1a0221a92799d3a4d618c22cae7ac72f67b9f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEntry.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEnum.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEnum.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5f9f19f9b97450763f7b4b9bc62ba8b6ca9eda7f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsEnum.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsValue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsValue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b22557ee8f81175fae1aab37f9207ae0ff680d4c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_SettingsValue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_StartScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_StartScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7e758d3ed2711ffb1e13b6f7c49dec7701a72464
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_StartScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TabButton.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TabButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..db744fff312a25da8784bc488f9bef53a8230b00
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TabButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TileButton.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TileButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..df9f92266d6ddd54f859856d7410a1bcd55278de
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_FontColor_TileButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSoftShadow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSoftShadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6e909e86056290f204084fc33368ffb5ba0036d0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSoftShadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cc6a8666f951994fa70b72381852b4388bf7fa1f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7eeef5f95d979221d4ee0f192f28375c9e37375a
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_DefaultLoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_DefaultLoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ed1ef4e5b8f640b1e33ee79e08d25202eca90339
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_DefaultLoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_Modal.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_Modal.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3aa9ac7944a9075358bee6daa8a3447292200fc6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingSymbol_Sine_Modal.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingTextColor.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingTextColor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..31e71b9eb13c0585593813eee80e2af79cf87e20
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_LoadingTextColor.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..db724a4f331d2e4cbaf89c35a76175f10fd8f5de
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_DefaultLoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_DefaultLoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..65c71f83ed4ce04ad0af6987a57f3143bc4c700b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_DefaultLoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..df7e7c4818d0108c55d03945e610334de2c5ee01
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow_DefaultLoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow_DefaultLoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4cd2cfbede08ba978dd2e9da358509562a87763e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_Glow_DefaultLoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..350e420a3844d65f47069f5d80ed396f081d4834
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_DefaultLoadingScreen.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_DefaultLoadingScreen.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7e6780250b37388a218fa65e2f9e41a6701b8736
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_DefaultLoadingScreen.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_Loading.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_Loading.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c3b86af79e9ba160cfb28b3b753b8f03f6ff0473
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftGlow_Loading.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftShadow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftShadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..36ac33e1fcb4107035f1059e812a64675b55a243
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Logo_SoftShadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MapTitleBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MapTitleBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3af914740181d17864503a880ef4638e38b971da
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MapTitleBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a16b6d832d6f21222824e4ef90461f1daae65d06
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost_Vertical.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost_Vertical.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..76ef7f037471db6295a11efb98f73cd8a2d2a2ba
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_AdditiveBoost_Vertical.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_Ring.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_Ring.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0d3c35452016b39e0cb1d9eaec0d97dcb91e5187
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_Ring.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9edcded8501db4dacb6ad17e955291af6feb69d4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_HighOpacity.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_HighOpacity.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6af16f735ff908165cb6f63c364007d6f0670c15
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_HighOpacity.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_Opaque.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_Opaque.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e7a1966b15cfcbcc0f9317695a4d17ee70e7426d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuBorder_SoftDarkBlue_Opaque.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..01545689b374d0175208390ccd4b5162154db7f2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Glow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e34ac78cc163a3efc0bed3499a589d6d92f2ba2f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Ring.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Ring.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..32692423f6326d02a73288a0a0c6acfbb245c386
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_Base_Ring.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_SoftShadow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_SoftShadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ed24db83451c818dd1d7d10000e75bc7237b2215
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_MenuButton_SoftShadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SafezoneAdjustors.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SafezoneAdjustors.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..13cfa13f0332bd0122603e3740ab59dfef20816c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SafezoneAdjustors.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_PingBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_PingBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9e3ba7dbffb58fecb4e6cac95b4dfd1d185ef2f4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_PingBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0d10fb6e442248a216cca426a5ef07ce3bd3c837
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5f60a0f5af59db7c4f7f7ebf554530fd3d48e2f9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreFill_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9927ed29f65e24b4e26358f2b4ce92e775e9966b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c8bdc5e704d5026f7bfa7f30cb2d36085003f634
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScoreBoard_ScoreHeader_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_BackgroundDim.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_BackgroundDim.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..98a6b6b521af9f564085f44b178c5a85c1661d19
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_BackgroundDim.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..933b481869082bf97676c39e688d0fc599cc0df9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ebfd855d0bd70df3480c69ee030d1c1936dcb004
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Scoreboard_Glow_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..24b7824e70b97005f3760b5cde2bab2ded5ee3c7
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Hover.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Hover.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9d413df0cf011f52c1dc21b12389be0bcf888bbc
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Hover.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Bottom.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Bottom.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0b231b61a763098925b27295b4f55bfa18c2d3f4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Bottom.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Left.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Left.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a512a7d4dba39f5b609ee584a9f513f9c1edef74
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Left.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Right.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Right.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2ecb7741519600119c42f2bc246e11dcc77ded65
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Right.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Top.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Top.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..60716ec350ecd0a9695f9ee77163d1b451ad4962
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Shadow_Top.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Track.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Track.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..22ad076a6b93cf43933328f28ce4a04d399611e9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_ScrollBar_Track.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7ac7681000357ea6ce9a805bf488c2e499cdb78d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_EmptyEntry.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_EmptyEntry.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6e7010ecfec9642081d2e49510883fbbf0c1f5d9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_EmptyEntry.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_PingBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_PingBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..697e67e785dec424407a13d6befa15c6bc92aa0d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_PingBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_SettingBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_SettingBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..be8eee5aa967ed3232471d6d106a46ef76304b18
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SessionButton_SettingBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4f61e8809cd6b341b20c456f99862b8afa9f54a2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeB.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeB.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ec655506bebfef4e2e7d1f1f0a18c3f932c6e875
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeB.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeC.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeC.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8908f08c2f16fd1398c1128d1d3f0a82ae69686b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeC.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeD.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeD.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6f8093649f64e6f3d97a6d916fd98e83b9e92834
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SettingsRotator_SizeD.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ArrowIcon.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ArrowIcon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5e10139d3c6d74b5b3e4f38536964c630a310f14
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ArrowIcon.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_BodyBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_BodyBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..887602c34a9e2ea67fe8febace1a87c66613708b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_BodyBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_DiamondIcon.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_DiamondIcon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..aceeaa075693bbcd6bd82955c6c5671a749fd91f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_DiamondIcon.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EntryBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EntryBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9a8475c2fb599c4b9672b259cdc4d8c84a18709f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EntryBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EnumBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EnumBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a987107f56e532421f63ccf53ce2b1d0c9a56fe5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_EnumBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_Menu.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_Menu.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0f9cb79f0735b1cadf5baeae19d339ccba41e346
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_Menu.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_OptionBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_OptionBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ac4875555483c80076f096d8f7bb14689bb1bd8b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_OptionBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ProgressBar.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ProgressBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..30001b241ea52cffba1da1fe5b3ab1a865f8fbec
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ProgressBar.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ResetArrow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ResetArrow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e110739754132818403bb37df9d37e9923b40ad
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_ResetArrow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_TabHeader.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_TabHeader.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..08ae3f1ff388640ccb3eb470ef0ae422e814f5bd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_TabHeader.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_XMarkIcon.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_XMarkIcon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1146018ec5a6b407fe0570a89522f66868d93b54
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Settings_XMarkIcon.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..392b59ccfaf34009c915d6b204d12bee9f51459d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_DebugOnly.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_DebugOnly.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..320ee1bb96304431da54db3f61921821b1624afe
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleMenuButton_DebugOnly.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..67a9fc607c7ebaaea7d3471fb9509bc1dc2feb16
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_Countdown.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_Countdown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..21a1f2d65f8a9c159f214ef485e4a5e25c8cf2f6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_Countdown.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_HighContrast.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_HighContrast.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6e1b0580832eb7d8a8e6352408203b3ade093bb4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_SimpleSpinner_HighContrast.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_StartScreen_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_StartScreen_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..53b5658390caa934a529bc6141fccd983b7a93e4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_StartScreen_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TabButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TabButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cb45572a9ff57ee900437c8357bd238a6c97b411
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TabButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BackgroundDim.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BackgroundDim.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..241bbaee13ce72d2421d24c8849c809b90c1a495
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BackgroundDim.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c6f7fca07dd5d47177c4b66fe15e9c2ac6ab3f5f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..49a1ee27d66903f7e9315962de7fc6ab413261c1
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Glow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..09703d9b096183025fb2652dd73e2aef7a2a2364
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_HealthBar.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_HealthBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7760f361137d008c82c67dd6e10bfafce5238e9a
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_HealthBar.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Mini.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Mini.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..42c90485a49dc66ffcc17594fffddddfb3175268
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_Mini.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_ScoreCounter.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_ScoreCounter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fbd863e076baefd41f8b81b2f60fd58cace07a7e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_BlueTeam_ScoreCounter.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_HealthBarBacking.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_HealthBarBacking.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ded943f9128569aa9bf87e2ae4cad35faa158116
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_HealthBarBacking.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_LogoBorder.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_LogoBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..754836f71884ee42f1090ff21da1084a53048237
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_LogoBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateGlow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..33f31b51c6251e87431b9422519c98bb04365181
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateGlow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateShadow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateShadow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5c6d7c6166789832786bcea1f958a4486e690a5f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_NameplateShadow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..05f1daa1035b99366f8d9045983936870dedbdd2
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Glow.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Glow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e571b7ab62a6a2a0a4d1fe97fb0e19dcaea19256
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Glow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_HealthBar.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_HealthBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..42bd131619d977de5ff0810f29c5694d2ef0f63d
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_HealthBar.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Mini.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Mini.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0b9f52ceac7b230229e074a46c96fdf85a44ef11
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_Mini.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_ScoreCounter.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_ScoreCounter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ff0d84b4897cfd2019021408439c3e384fe963cb
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_RedTeam_ScoreCounter.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Ring.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Ring.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..25f2123fc76e1de7ddb5eacb0752a9a634abc568
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Ring.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9b4f678dd4fa0e306141509b3e271fe8c9964c30
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4527e0f298566cc513a1142d140d0cb992100180
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_SoftGlow_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..38542b94e04537aa797c035c7dfb4c50345de2a1
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e203bcc49687992927daf7cf0b532f7b03ccf167
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Stripe_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f0fab83606354def9c6d99d89533ab6b188c196b
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e195f87b8f60fbda9a534f6a32f9b6712d5f827c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_TextBorder_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Blue.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Blue.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1469da559931c5a3ba4b8406c4faafa2a2e92ad0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Blue.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Red.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Red.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b80c80f1507fae3f586a6e6a38ea21437862b897
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_Teams_Text_Red.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TileButton_Base.uasset b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TileButton_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e2f7dd8205857860a77dd6b06a403677f5410e99
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/Art/MI_UI_TileButton_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/LyraScrollBox.uasset b/LyraStarterGame/Content/UI/Menu/LyraScrollBox.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..189169b336f62422c305a125f50c775b4089c93e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/LyraScrollBox.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/MI_UI_TitleMaterial.uasset b/LyraStarterGame/Content/UI/Menu/MI_UI_TitleMaterial.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..eddc2c4b3686f64cce3450ee7452b5e54de42cd0
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/MI_UI_TitleMaterial.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/W_BuildConfiguration.uasset b/LyraStarterGame/Content/UI/Menu/W_BuildConfiguration.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..605aa4a0b3abd4212e0c7a7dea715863ed477c0c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/W_BuildConfiguration.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/W_LyraArrowButton.uasset b/LyraStarterGame/Content/UI/Menu/W_LyraArrowButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..54bc86d2f98b0d68ab74748cd20bdde3ec70e2fd
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/W_LyraArrowButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/W_LyraMenuButton_Modal.uasset b/LyraStarterGame/Content/UI/Menu/W_LyraMenuButton_Modal.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4b0c07c3f217cdf997014bfdaad180909a740963
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/W_LyraMenuButton_Modal.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/W_TouchCloseButton.uasset b/LyraStarterGame/Content/UI/Menu/W_TouchCloseButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5b8848baf49484b02cba168e85172ec1b6506dc5
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/W_TouchCloseButton.uasset differ
diff --git a/LyraStarterGame/Content/UI/Menu/W_UserWatermark.uasset b/LyraStarterGame/Content/UI/Menu/W_UserWatermark.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d2ee809ae1a4abf1cceb08c1fb1df353676cdf9e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Menu/W_UserWatermark.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_FrontEnd.uasset b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_FrontEnd.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..df9d929a66beefcfbcc49cfc4b08e4de823ff69f
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_FrontEnd.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_GraphOnly.uasset b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_GraphOnly.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bfdc40a607d249c126d2f680adf1d88c8eb8a52e
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_GraphOnly.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_TextOnly.uasset b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_TextOnly.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3e7300f0245b9ca53f90a0d0a96a88d841944f0c
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatContainer_TextOnly.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_PerfStatGraph.uasset b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatGraph.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7fbe26a51b76234ebfafb6525675f37dd1e969b3
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_PerfStatGraph.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_SingleGraphStat.uasset b/LyraStarterGame/Content/UI/PerfStats/W_SingleGraphStat.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b367547dc7a38f0a4ffb74c522ac9cc0b9531d0b
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_SingleGraphStat.uasset differ
diff --git a/LyraStarterGame/Content/UI/PerfStats/W_SingleTextStat.uasset b/LyraStarterGame/Content/UI/PerfStats/W_SingleTextStat.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b5ac813b8f54a26a75bae441e452cbf124dada6b
Binary files /dev/null and b/LyraStarterGame/Content/UI/PerfStats/W_SingleTextStat.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/DT_SaveActions.uasset b/LyraStarterGame/Content/UI/Settings/DT_SaveActions.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..993542b11f9794ae98e067a28ec6ac931b1e0ad6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/DT_SaveActions.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Editors/W_SettingEntryBackground.uasset b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingEntryBackground.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c7291d2273d933f1adfe297654b407f932d7e913
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingEntryBackground.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Header.uasset b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Header.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c63260762ac58d18d5493453c6c970db7c22d3ec
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Header.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Missing.uasset b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Missing.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b516e2a3d8f361bf48cd60d3a8433f312a6e352e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_Missing.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_SubCollection.uasset b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_SubCollection.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..62db2d111f1fd9629f9bde937fa5698fa0eac271
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Editors/W_SettingsListEntry_SubCollection.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Extensions/ColorBlind/How To Generate Ishihara Plates.txt b/LyraStarterGame/Content/UI/Settings/Extensions/ColorBlind/How To Generate Ishihara Plates.txt
new file mode 100644
index 0000000000000000000000000000000000000000..38035995fe4211138930031c474e2a3cb7219fe8
--- /dev/null
+++ b/LyraStarterGame/Content/UI/Settings/Extensions/ColorBlind/How To Generate Ishihara Plates.txt	
@@ -0,0 +1 @@
+You can use the online generator here, https://nickdarnell.github.io/franciscouzo/ishihara/.  It's a forked and slightly modified version from one found here, https://franciscouzo.github.io/ishihara/.
\ No newline at end of file
diff --git a/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionDetailsEntry.uasset b/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionDetailsEntry.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..31611ba1cb6705b9c9fa7f7baf12b10ce0eb44bb
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionDetailsEntry.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionExtension.uasset b/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionExtension.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..97c9bf89c3c5bc5c9cc456bdf6e1d3d44275bd62
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Extensions/Enum/W_EnumOptionExtension.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/GameSubtitleOptions.uasset b/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/GameSubtitleOptions.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6c393371f55ce594e4a211038af9210a759f9c26
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/GameSubtitleOptions.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/W_Settings_SubtitlePreview.uasset b/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/W_Settings_SubtitlePreview.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bb4e8964b5799337cd72f2a5683733d829935027
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Extensions/Subtitle/W_Settings_SubtitlePreview.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/GameSettingRegistryVisuals.uasset b/LyraStarterGame/Content/UI/Settings/GameSettingRegistryVisuals.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..95b1acf025c2e0d494fce0060c062e21344497e3
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/GameSettingRegistryVisuals.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/BottomSettingsPip_T.uasset b/LyraStarterGame/Content/UI/Settings/Media/BottomSettingsPip_T.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6ada3a9f871cf8e69887483980b1f59ad76f8b73
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/BottomSettingsPip_T.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingBorder_Base.uasset b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingBorder_Base.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0bcd3ae0bde0297b3b9431d6fe48d4297e2ead08
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingBorder_Base.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsBorder.uasset b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1a214c1715efb0a16ad847fd918655c58bf4d4d7
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsBorder.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG.uasset b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b5a51961a90dada73aecf564e488a622882d1f5e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG_Inst.uasset b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG_Inst.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c2d44b43577e5abf15cd7773311a8d8ef1ca657c
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/M_UI_SettingsPanelBG_Inst.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/SettingsDefaultSlider_M.uasset b/LyraStarterGame/Content/UI/Settings/Media/SettingsDefaultSlider_M.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..198d9fc7a58bc50363f3680520357e7a9c7cd5d6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/SettingsDefaultSlider_M.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/SettingsRotator_M.uasset b/LyraStarterGame/Content/UI/Settings/Media/SettingsRotator_M.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ee5fedcad26d578c59764464ea09253d10e1a559
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/SettingsRotator_M.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Media/Window_Arrow_16x.uasset b/LyraStarterGame/Content/UI/Settings/Media/Window_Arrow_16x.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4829b54d6233be8d6dc6e8e833a0285fc196d79e
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Media/Window_Arrow_16x.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/Gamma/T_GammaTestImage.uasset b/LyraStarterGame/Content/UI/Settings/Screens/Gamma/T_GammaTestImage.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e3a85064da492ca049979448b2a91e8b6a33b2ee
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/Gamma/T_GammaTestImage.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/Gamma/W_GammaEditor.uasset b/LyraStarterGame/Content/UI/Settings/Screens/Gamma/W_GammaEditor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5f6311677fdb2fe651bf2fb5115b6b7fa9928279
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/Gamma/W_GammaEditor.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/MI_UI_RadialGradient.uasset b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/MI_UI_RadialGradient.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b6ecc7ea0ba3c4bdca0ef4b0badc8e56088cd5d4
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/MI_UI_RadialGradient.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/M_Ui_SafeZoneCornerArrow.uasset b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/M_Ui_SafeZoneCornerArrow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4011063aed3fa641105a7cd489adab1f5f0532ef
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/M_Ui_SafeZoneCornerArrow.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/W_SafeZoneEditor.uasset b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/W_SafeZoneEditor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ab63f2fa3a04af7af2f75e28b7319161cc933cbb
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/SafeZone/W_SafeZoneEditor.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/W_KeyAlreadyBoundWarning.uasset b/LyraStarterGame/Content/UI/Settings/Screens/W_KeyAlreadyBoundWarning.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4404e35c455b080bd3e8d4309edc6a458702126f
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/W_KeyAlreadyBoundWarning.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/Screens/W_PressAnyKey.uasset b/LyraStarterGame/Content/UI/Settings/Screens/W_PressAnyKey.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0c8a2e3f6617ed3431fd228a2e971b7a606dd6e9
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/Screens/W_PressAnyKey.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/SettingsDescriptionStyles.uasset b/LyraStarterGame/Content/UI/Settings/SettingsDescriptionStyles.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..dfdd0f448696254dac7a004fdaa20b2e8eaac9cc
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/SettingsDescriptionStyles.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/SettingsDescriptionWarningStyes.uasset b/LyraStarterGame/Content/UI/Settings/SettingsDescriptionWarningStyes.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8f56ce26b1ee322cee3a853107db0e05b7ff1af8
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/SettingsDescriptionWarningStyes.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/W_GameSettingsDetailView.uasset b/LyraStarterGame/Content/UI/Settings/W_GameSettingsDetailView.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a93bc033a64d0c4d7497992fea3a9422e0bd6377
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/W_GameSettingsDetailView.uasset differ
diff --git a/LyraStarterGame/Content/UI/Settings/W_SettingsPanel.uasset b/LyraStarterGame/Content/UI/Settings/W_SettingsPanel.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4588bf2428f1ba66e4489c1b56e43e34819fe1c6
Binary files /dev/null and b/LyraStarterGame/Content/UI/Settings/W_SettingsPanel.uasset differ
diff --git a/LyraStarterGame/Content/UI/W_OverallUILayout.uasset b/LyraStarterGame/Content/UI/W_OverallUILayout.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..58aba726c674f7c42e933dfeedb09579256e2fa8
Binary files /dev/null and b/LyraStarterGame/Content/UI/W_OverallUILayout.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow2_NoPattern.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow2_NoPattern.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4bcd22818f0dd8a1c3a64e91224045ab5bc3a921
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow2_NoPattern.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_MinorPattern.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_MinorPattern.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..23d2d98a61a6f330039ad64f9b3da4fe2f246ba6
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_MinorPattern.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_NoPattern.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_NoPattern.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2d2c56f94e62ebdc77d2c02f1be17f8a56640ddf
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/MI_InternalShapeGlow_NoPattern.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/M_Glass.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/M_Glass.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..94decb86154ddba679d1e84c7ded2bb17f519b60
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/M_Glass.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/M_InternalShapeGlow.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/M_InternalShapeGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1421e93ba9720fb62602b556f7025c6619497f84
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/M_InternalShapeGlow.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Generic/Materials/M_Item.uasset b/LyraStarterGame/Content/Weapons/Generic/Materials/M_Item.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..983b4c5ee7c5b656972cf5634490611d153b3fa8
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Generic/Materials/M_Item.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Grenade/Material/MI_Weapon_Grenade.uasset b/LyraStarterGame/Content/Weapons/Grenade/Material/MI_Weapon_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1c8bfe0c34fce0218257efdd9fc3d62cd9ea6df3
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Grenade/Material/MI_Weapon_Grenade.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Grenade/Mesh/SM_grenade.uasset b/LyraStarterGame/Content/Weapons/Grenade/Mesh/SM_grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5d157ceb79c1d952ec044f134d81b5c7de04a6d9
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Grenade/Mesh/SM_grenade.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackFull.uasset b/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackFull.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a1b73c65878eb84e03a9bef1d670830a7032a605
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackFull.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackPart.uasset b/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackPart.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1362b356f717a0500c40fca6fbff90f5f2bf3caf
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Healthpack/Material/MI_Item_HealthPackPart.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/ABP_Weap_Pistol.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/ABP_Weap_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2d3750a59e9305bb5d29e8bd4c2a98c817ac4b79
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/ABP_Weap_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_DryFire.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_DryFire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b5da1d7caf2ee21ebf83d9efe9a42ed8c55cf86b
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_DryFire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Equip.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Equip.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6a8909de6692acc4bfb29bb371e6a6908f480bde
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Equip.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Fire.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e99acb097aa37d26955a294157d1e043c3bc68d7
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..24e5ff8d0873c596e6297811add06d1bb79aaa2e
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload_Emote_MW.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload_Emote_MW.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3d642573ce513387d65ba2625e37d4fa508d9b4d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_MM_Pistol_Reload_Emote_MW.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Fire.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a121d90df79ad9553ceb3decbc3c5493121fc1f9
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Reload.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..94bc85386b9faf84e05b0b415ee45d7a698108ef
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/AM_Weap_Pistol_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Fire.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f516fa0a66367b3063509adb1351989e863b73b6
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Reload.uasset b/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c4cfe953aff6ac3e19b3e9c2208852ba2a50f71d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Animations/Weap_Pistol_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/GA_Weapon_Reload_Pistol.uasset b/LyraStarterGame/Content/Weapons/Pistol/GA_Weapon_Reload_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e97f1bc4fa52d5d09aa52d9bff05352bd282896
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/GA_Weapon_Reload_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/GE_Damage_Pistol.uasset b/LyraStarterGame/Content/Weapons/Pistol/GE_Damage_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..02086bbf775cf0b4c396625a474aaec42412ee0b
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/GE_Damage_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Materials/MI_Weapon_Pistol.uasset b/LyraStarterGame/Content/Weapons/Pistol/Materials/MI_Weapon_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..47585439006360676b637012e30078a0390e1b34
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Materials/MI_Weapon_Pistol.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_PhysicsAsset.uasset b/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_PhysicsAsset.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3c9bc538f4b53b1ede4d7d0f4d6d1d94e613552b
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_PhysicsAsset.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_Skeleton.uasset b/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_Skeleton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1bf60fbcd9b0f6fb6fadddd9d89242a682bc055e
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Pistol/Mesh/SK_Pistol_Skeleton.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/ABP_Weap_Rifle.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/ABP_Weap_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1f12a93c224beda57efeb92be8b03ea8fb8f216d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/ABP_Weap_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_DryFire.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_DryFire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b2548bca74e23f19038b2ef933f2dacd0870aaa1
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_DryFire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Equip.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Equip.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..13ff1b16b71e82da30eedc51678da60934d2f9e4
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Equip.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Fire.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..01c41fca3cd7d0d64573965c74a14b1b09c07ee1
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..620644731c583a2c75c912c4d4bd51b9494e81ff
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload_Emote_MW.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload_Emote_MW.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a8eefe5ba10a78626eaacb616291dfec04471eae
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_MM_Rifle_Reload_Emote_MW.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Fire.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a702bd0c008e6ac39d88328f288f43e1299d9b51
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Reload.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c630c7c1e833ae8129d343cb5a7df0b36efe795d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/AM_Weap_Rifle_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Fire.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5d86afa80d73ecee1d085709d1e41c58772c84a0
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Reload.uasset b/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c0bb86275ebc8420b70bb75744aed35500360f5c
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Animations/Weap_Rifle_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Materials/MI_Weapon_Rifle.uasset b/LyraStarterGame/Content/Weapons/Rifle/Materials/MI_Weapon_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..045d533e70e0b756895aab0b2a1f6d8c40c02336
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Materials/MI_Weapon_Rifle.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_PhysicsAsset.uasset b/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_PhysicsAsset.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6c291b6e663fe00dc1827605430130447c34dba6
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_PhysicsAsset.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_Skeleton.uasset b/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_Skeleton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ab52db4e0af5c562e4e5b2b9d2f89d317e949e30
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Rifle/Mesh/SK_Rifle_Skeleton.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/ABP_Weap_Shotgun.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/ABP_Weap_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ea5dfb0a2ae5f0a283f4bd81b2d2211d40c1b4e8
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/ABP_Weap_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Fire.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3b78fb2855df098625e80ddb8b7325d2c8cad5e2
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2426509acddf6fc29a5e2845fd5462cce6639208
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload_Emote_MW.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload_Emote_MW.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5eb9ad3456357799b60bcae6faba903bec798ed4
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_MM_Shotgun_Reload_Emote_MW.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Fire.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7026cf595efc653bd28e8d2a64aaa605aace4e3d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Reload.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8c44a6c2a175759a11d848171dd09a9be0d09eb7
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/AM_Weap_Shotgun_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Fire.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a6eddffed64be6b3eeffde3353630ea6a178e168
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Fire.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Reload.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Reload.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b7f34f4112bc5a99d6fdde543fc34bcd6b24d217
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Animations/Weap_Shotgun_Reload.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Materials/MI_Weapon_Shotgun.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Materials/MI_Weapon_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fb4da50889a9b0326d0125a32473c1ac441d66f1
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Materials/MI_Weapon_Shotgun.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_PhysicsAsset.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_PhysicsAsset.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0c9f7f6aa394ab11388d8cc7893f575f2dad55cf
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_PhysicsAsset.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_Skeleton.uasset b/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_Skeleton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3922f45cd3069221919c28273eed7c59562dec03
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Shotgun/Mesh/SK_Shotgun_Skeleton.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..46c017b65243a4d293b11f6c2938d65df5e13c2b
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Circle.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Circle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7df23126829a1a289e60b12d512b0b7f90a0f35c
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Circle.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Hex.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Hex.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5a5a09eac3197bf6b9fe31cb352ba593252afcb5
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Hex.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Square.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Square.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c1f4a86beaba1776e5d24b2f1c0d5232571c6d6e
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Material/MI_InternalShapeGlow_Square.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Material/M_MetalChroma_LaunchPad.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Material/M_MetalChroma_LaunchPad.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c344d3eb30794e9aacbfa2c3d4cec8cd02537eb8
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Material/M_MetalChroma_LaunchPad.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Hex.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Hex.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..702bb7422aa80a82194a3502b7845d483e83904c
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Hex.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Square.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Square.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b3de456dcee32701aa5bb6e414bdae4a1c2d1b0d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Mesh/SM_launchpad_Square.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Spawnpad/Texture/T_LaunchPadShape.uasset b/LyraStarterGame/Content/Weapons/Spawnpad/Texture/T_LaunchPadShape.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9bb1fe0f4de1455d49af5db58520297ebb15925b
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Spawnpad/Texture/T_LaunchPadShape.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Tests/B_ShootingTarget.uasset b/LyraStarterGame/Content/Weapons/Tests/B_ShootingTarget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d073680f22ee7479efceb1538ac1c3c5a19d5f6d
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Tests/B_ShootingTarget.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Tests/GE_HugeHealthTarget.uasset b/LyraStarterGame/Content/Weapons/Tests/GE_HugeHealthTarget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9cfb4f04c100a1b5dc43a355489ec69f59e7ffe0
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Tests/GE_HugeHealthTarget.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_AbilitySet.uasset b/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_AbilitySet.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d9557fdf1199b435c5241b6481bac23562f2385f
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_AbilitySet.uasset differ
diff --git a/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_PawnData.uasset b/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_PawnData.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..62c391c27f187758376524911bc7af11c83cf667
Binary files /dev/null and b/LyraStarterGame/Content/Weapons/Tests/ShootingTarget_PawnData.uasset differ
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/CommonGame.Build.cs b/LyraStarterGame/Plugins/CommonGame/Source/CommonGame.Build.cs
new file mode 100644
index 0000000000000000000000000000000000000000..af81cdcacbb2bf6a71f1b56067ca81e561ec31ec
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/CommonGame.Build.cs
@@ -0,0 +1,43 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class CommonGame : ModuleRules
+{
+	public CommonGame(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;				
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"InputCore",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				"UMG",
+				"CommonInput",
+				"CommonUI",
+				"CommonUser",
+				"GameplayTags",
+				"ModularGameplayActors",
+			}
+		);
+			
+		
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+			}
+		);
+		
+		
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+			}
+		);
+	}
+}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameInstance.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameInstance.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ee5a9acc650d64456da8459053d1a6a4856b5988
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameInstance.cpp
@@ -0,0 +1,210 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonGameInstance.h"
+
+#include "CommonLocalPlayer.h"
+#include "CommonSessionSubsystem.h"
+#include "CommonUISettings.h"
+#include "CommonUserSubsystem.h"
+#include "GameUIManagerSubsystem.h"
+#include "ICommonUIModule.h"
+#include "LogCommonGame.h"
+#include "Messaging/CommonGameDialog.h"
+#include "Messaging/CommonMessagingSubsystem.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonGameInstance)
+
+UCommonGameInstance::UCommonGameInstance(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+
+}
+
+void UCommonGameInstance::HandleSystemMessage(FGameplayTag MessageType, FText Title, FText Message)
+{
+	ULocalPlayer* FirstPlayer = GetFirstGamePlayer();
+	// Forward severe ones to the error dialog for the first player
+	if (FirstPlayer && MessageType.MatchesTag(FCommonUserTags::SystemMessage_Error))
+	{
+		if (UCommonMessagingSubsystem* Messaging = FirstPlayer->GetSubsystem<UCommonMessagingSubsystem>())
+		{
+			Messaging->ShowError(UCommonGameDialogDescriptor::CreateConfirmationOk(Title, Message));
+		}
+	}
+}
+
+void UCommonGameInstance::HandlePrivilegeChanged(const UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserAvailability OldAvailability, ECommonUserAvailability NewAvailability)
+{
+	// By default show errors and disconnect if play privilege for first player is lost
+	if (Privilege == ECommonUserPrivilege::CanPlay && OldAvailability == ECommonUserAvailability::NowAvailable && NewAvailability != ECommonUserAvailability::NowAvailable)
+	{
+		UE_LOG(LogCommonGame, Error, TEXT("HandlePrivilegeChanged: Player %d no longer has permission to play the game!"), UserInfo->LocalPlayerIndex);
+		// TODO: Games can do something specific in subclass
+		// ReturnToMainMenu();
+	}
+}
+
+void UCommonGameInstance::HandlerUserInitialized(const UCommonUserInfo* UserInfo, bool bSuccess, FText Error, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext OnlineContext)
+{
+	// Subclasses can override this
+}
+
+int32 UCommonGameInstance::AddLocalPlayer(ULocalPlayer* NewPlayer, FPlatformUserId UserId)
+{
+	int32 ReturnVal = Super::AddLocalPlayer(NewPlayer, UserId);
+	if (ReturnVal != INDEX_NONE)
+	{
+		if (!PrimaryPlayer.IsValid())
+		{
+			UE_LOG(LogCommonGame, Log, TEXT("AddLocalPlayer: Set %s to Primary Player"), *NewPlayer->GetName());
+			PrimaryPlayer = NewPlayer;
+		}
+		
+		GetSubsystem<UGameUIManagerSubsystem>()->NotifyPlayerAdded(Cast<UCommonLocalPlayer>(NewPlayer));
+	}
+	
+	return ReturnVal;
+}
+
+bool UCommonGameInstance::RemoveLocalPlayer(ULocalPlayer* ExistingPlayer)
+{
+	if (PrimaryPlayer == ExistingPlayer)
+	{
+		//TODO: do we want to fall back to another player?
+		PrimaryPlayer.Reset();
+		UE_LOG(LogCommonGame, Log, TEXT("RemoveLocalPlayer: Unsetting Primary Player from %s"), *ExistingPlayer->GetName());
+	}
+	GetSubsystem<UGameUIManagerSubsystem>()->NotifyPlayerDestroyed(Cast<UCommonLocalPlayer>(ExistingPlayer));
+
+	return Super::RemoveLocalPlayer(ExistingPlayer);
+}
+
+void UCommonGameInstance::Init()
+{
+	Super::Init();
+
+	// After subsystems are initialized, hook them together
+	FGameplayTagContainer PlatformTraits = ICommonUIModule::GetSettings().GetPlatformTraits();
+
+	UCommonUserSubsystem* UserSubsystem = GetSubsystem<UCommonUserSubsystem>();
+	if (ensure(UserSubsystem))
+	{
+		UserSubsystem->SetTraitTags(PlatformTraits);
+		UserSubsystem->OnHandleSystemMessage.AddDynamic(this, &UCommonGameInstance::HandleSystemMessage);
+		UserSubsystem->OnUserPrivilegeChanged.AddDynamic(this, &UCommonGameInstance::HandlePrivilegeChanged);
+		UserSubsystem->OnUserInitializeComplete.AddDynamic(this, &UCommonGameInstance::HandlerUserInitialized);
+	}
+
+	UCommonSessionSubsystem* SessionSubsystem = GetSubsystem<UCommonSessionSubsystem>();
+	if (ensure(SessionSubsystem))
+	{
+		SessionSubsystem->OnUserRequestedSessionEvent.AddUObject(this, &UCommonGameInstance::OnUserRequestedSession);
+		SessionSubsystem->OnDestroySessionRequestedEvent.AddUObject(this, &UCommonGameInstance::OnDestroySessionRequested);
+	}
+}
+
+void UCommonGameInstance::ResetUserAndSessionState()
+{
+	UCommonUserSubsystem* UserSubsystem = GetSubsystem<UCommonUserSubsystem>();
+	if (ensure(UserSubsystem))
+	{
+		UserSubsystem->ResetUserState();
+	}
+
+	UCommonSessionSubsystem* SessionSubsystem = GetSubsystem<UCommonSessionSubsystem>();
+	if (ensure(SessionSubsystem))
+	{
+		SessionSubsystem->CleanUpSessions();
+	}
+}
+
+void UCommonGameInstance::ReturnToMainMenu()
+{
+	// By default when returning to main menu we should reset everything
+	ResetUserAndSessionState();
+
+	Super::ReturnToMainMenu();
+}
+
+void UCommonGameInstance::OnUserRequestedSession(const FPlatformUserId& PlatformUserId, UCommonSession_SearchResult* InRequestedSession, const FOnlineResultInformation& RequestedSessionResult)
+{
+	if (InRequestedSession)
+	{
+		SetRequestedSession(InRequestedSession);
+	}
+	else
+	{
+		HandleSystemMessage(FCommonUserTags::SystemMessage_Error, NSLOCTEXT("CommonGame", "Warning_RequestedSessionFailed", "Requested Session Failed"), RequestedSessionResult.ErrorText);
+	}
+}
+
+void UCommonGameInstance::OnDestroySessionRequested(const FPlatformUserId& PlatformUserId, const FName& SessionName)
+{
+	// When a session destroy is requested, please make sure that your project is in the right state to destroy the session and transition out of it
+
+	UE_LOG(LogCommonGame, Verbose, TEXT("[%hs] PlatformUserId:%d, SessionName: %s)"), __FUNCTION__, PlatformUserId.GetInternalId(), *SessionName.ToString());
+
+	ReturnToMainMenu();
+}
+
+void UCommonGameInstance::SetRequestedSession(UCommonSession_SearchResult* InRequestedSession)
+{
+	RequestedSession = InRequestedSession;
+	if (RequestedSession)
+	{
+		if (CanJoinRequestedSession())
+		{
+			JoinRequestedSession();
+		}
+		else
+		{
+			ResetGameAndJoinRequestedSession();
+		}
+	}
+}
+
+bool UCommonGameInstance::CanJoinRequestedSession() const
+{
+	// Default behavior is always allow joining the requested session
+	return true;
+}
+
+void UCommonGameInstance::JoinRequestedSession()
+{
+	if (RequestedSession)
+	{
+		if (ULocalPlayer* const FirstPlayer = GetFirstGamePlayer())
+		{
+			UCommonSessionSubsystem* SessionSubsystem = GetSubsystem<UCommonSessionSubsystem>();
+			if (ensure(SessionSubsystem))
+			{
+				// Clear our current requested session since we are now acting on it.
+				UCommonSession_SearchResult* LocalRequestedSession = RequestedSession;
+				RequestedSession = nullptr;
+				SessionSubsystem->JoinSession(FirstPlayer->PlayerController, LocalRequestedSession);
+			}
+		}
+	}
+}
+
+void UCommonGameInstance::ResetGameAndJoinRequestedSession()
+{
+	// Default behavior is to return to the main menu.  The game must call JoinRequestedSession when the game is in a ready state.
+	ReturnToMainMenu();
+}
+
+
+//void UCommonGameInstance::OnPreLoadMap(const FString& MapName)
+//{
+//	if (!IsDedicatedServerInstance())
+//	{
+//		if (!bWasInLoadMap)
+//		{
+//			UGameUIManagerSubsystem* UIManager = GetSubsystem<UGameUIManagerSubsystem>();
+//			for (ULocalPlayer* LocalPlayer : LocalPlayers)
+//			{
+//				UIManager->NotifyPlayerAdded(Cast<UCommonLocalPlayer>(LocalPlayer));
+//			}
+//		}
+//	}
+//}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameModule.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameModule.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d8a4bc07041f9d1b5fdfe3bdd63339433ab93d37
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonGameModule.cpp
@@ -0,0 +1,32 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "Modules/ModuleManager.h"
+
+/**
+ * Implements the FCommonGameModule module.
+ */
+class FCommonGameModule : public IModuleInterface
+{
+public:
+	FCommonGameModule();
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+
+private:
+
+};
+
+
+FCommonGameModule::FCommonGameModule()
+{
+}
+
+void FCommonGameModule::StartupModule()
+{
+}
+
+void FCommonGameModule::ShutdownModule()
+{
+}
+
+IMPLEMENT_MODULE(FCommonGameModule, CommonGame);
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonLocalPlayer.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonLocalPlayer.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..10071968542c378ee091b72ffd204c1170881cb7
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonLocalPlayer.cpp
@@ -0,0 +1,81 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonLocalPlayer.h"
+
+#include "Engine/GameInstance.h"
+#include "GameFramework/PlayerController.h"
+#include "GameUIManagerSubsystem.h"
+#include "GameUIPolicy.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonLocalPlayer)
+
+class APawn;
+class APlayerState;
+class FViewport;
+struct FSceneViewProjectionData;
+
+UCommonLocalPlayer::UCommonLocalPlayer()
+	: Super(FObjectInitializer::Get())
+{
+}
+
+FDelegateHandle UCommonLocalPlayer::CallAndRegister_OnPlayerControllerSet(FPlayerControllerSetDelegate::FDelegate Delegate)
+{
+	APlayerController* PC = GetPlayerController(GetWorld());
+
+	if (PC)
+	{
+		Delegate.Execute(this, PC);
+	}
+
+	return OnPlayerControllerSet.Add(Delegate);
+}
+
+FDelegateHandle UCommonLocalPlayer::CallAndRegister_OnPlayerStateSet(FPlayerStateSetDelegate::FDelegate Delegate)
+{
+	APlayerController* PC = GetPlayerController(GetWorld());
+	APlayerState* PlayerState = PC ? PC->PlayerState : nullptr;
+
+	if (PlayerState)
+	{
+		Delegate.Execute(this, PlayerState);
+	}
+	
+	return OnPlayerStateSet.Add(Delegate);
+}
+
+FDelegateHandle UCommonLocalPlayer::CallAndRegister_OnPlayerPawnSet(FPlayerPawnSetDelegate::FDelegate Delegate)
+{
+	APlayerController* PC = GetPlayerController(GetWorld());
+	APawn* Pawn = PC ? PC->GetPawn() : nullptr;
+
+	if (Pawn)
+	{
+		Delegate.Execute(this, Pawn);
+	}
+
+	return OnPlayerPawnSet.Add(Delegate);
+}
+
+bool UCommonLocalPlayer::GetProjectionData(FViewport* Viewport, FSceneViewProjectionData& ProjectionData, int32 StereoViewIndex) const
+{
+	if (!bIsPlayerViewEnabled)
+	{
+		return false;
+	}
+
+	return Super::GetProjectionData(Viewport, ProjectionData, StereoViewIndex);
+}
+
+UPrimaryGameLayout* UCommonLocalPlayer::GetRootUILayout() const
+{
+	if (UGameUIManagerSubsystem* UIManager = GetGameInstance()->GetSubsystem<UGameUIManagerSubsystem>())
+	{
+		if (UGameUIPolicy* Policy = UIManager->GetCurrentUIPolicy())
+		{
+			return Policy->GetRootLayout(this);
+		}
+	}
+
+	return nullptr;
+}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerController.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerController.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e10a1e8c8d3a584395103f8be5d82b7800d07a20
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerController.cpp
@@ -0,0 +1,72 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonPlayerController.h"
+
+#include "CommonLocalPlayer.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonPlayerController)
+
+class APawn;
+
+ACommonPlayerController::ACommonPlayerController(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void ACommonPlayerController::ReceivedPlayer()
+{
+	Super::ReceivedPlayer();
+	
+	if (UCommonLocalPlayer* LocalPlayer = Cast<UCommonLocalPlayer>(Player))
+	{
+		LocalPlayer->OnPlayerControllerSet.Broadcast(LocalPlayer, this);
+
+		if (PlayerState)
+		{
+			LocalPlayer->OnPlayerStateSet.Broadcast(LocalPlayer, PlayerState);
+		}
+	}
+}
+
+void ACommonPlayerController::SetPawn(APawn* InPawn)
+{
+	Super::SetPawn(InPawn);
+
+	if (UCommonLocalPlayer* LocalPlayer = Cast<UCommonLocalPlayer>(Player))
+	{
+		LocalPlayer->OnPlayerPawnSet.Broadcast(LocalPlayer, InPawn);
+	}
+}
+
+void ACommonPlayerController::OnPossess(APawn* APawn)
+{
+	Super::OnPossess(APawn);
+	
+	if (UCommonLocalPlayer* LocalPlayer = Cast<UCommonLocalPlayer>(Player))
+	{
+		LocalPlayer->OnPlayerPawnSet.Broadcast(LocalPlayer, APawn);
+	}
+}
+
+void ACommonPlayerController::OnUnPossess()
+{
+	Super::OnUnPossess();
+
+	if (UCommonLocalPlayer* LocalPlayer = Cast<UCommonLocalPlayer>(Player))
+	{
+		LocalPlayer->OnPlayerPawnSet.Broadcast(LocalPlayer, nullptr);
+	}
+}
+
+void ACommonPlayerController::OnRep_PlayerState()
+{
+	Super::OnRep_PlayerState();
+
+	if (PlayerState)
+	{
+		if (UCommonLocalPlayer* LocalPlayer = Cast<UCommonLocalPlayer>(Player))
+		{
+			LocalPlayer->OnPlayerStateSet.Broadcast(LocalPlayer, PlayerState);
+		}
+	}
+}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerInputKey.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerInputKey.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e6846227bb2d7bb56e45dca9c1d760b701698160
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonPlayerInputKey.cpp
@@ -0,0 +1,531 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonPlayerInputKey.h"
+
+#include "CommonInputSubsystem.h"
+#include "CommonInputTypeEnum.h"
+#include "CommonLocalPlayer.h"
+#include "CommonPlayerController.h"
+#include "Fonts/FontMeasure.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Rendering/SlateRenderer.h"
+#include "TimerManager.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonPlayerInputKey)
+
+class FPaintArgs;
+class FSlateRect;
+
+#define LOCTEXT_NAMESPACE "CommonKeybindWidget"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogCommonPlayerInput, Log, All);
+DEFINE_LOG_CATEGORY(LogCommonPlayerInput);
+
+struct FSlateDrawUtil
+{
+	static void DrawBrushCenterFit(
+		FSlateWindowElementList& ElementList,
+		uint32 InLayer,
+		const FGeometry& InAllottedGeometry,
+		const FSlateBrush* InBrush,
+		const FLinearColor& InTint = FLinearColor::White)
+	{
+		DrawBrushCenterFitWithOffset
+		(
+			ElementList,
+			InLayer,
+			InAllottedGeometry,
+			InBrush,
+			InTint,
+			FVector2D(0, 0)
+		);
+	}
+
+	static void DrawBrushCenterFitWithOffset(
+		FSlateWindowElementList& ElementList,
+		uint32 InLayer,
+		const FGeometry& InAllottedGeometry,
+		const FSlateBrush* InBrush,
+		const FLinearColor& InTint,
+		const FVector2D InOffset)
+	{
+		if (!InBrush)
+		{
+			return;
+		}
+
+		const FVector2D AreaSize = InAllottedGeometry.GetLocalSize();
+		const FVector2D ProgressSize = InBrush->GetImageSize();
+		const float FitScale = FMath::Min(FMath::Min(AreaSize.X / ProgressSize.X, AreaSize.Y / ProgressSize.Y), 1.0f);
+		const FVector2D FinalSize = FitScale * ProgressSize;
+
+		const FVector2D Offset = (InAllottedGeometry.GetLocalSize() * 0.5f) - (FinalSize * 0.5f) + InOffset;
+
+		FSlateDrawElement::MakeBox
+		(
+			ElementList,
+			InLayer,
+			InAllottedGeometry.ToPaintGeometry(FinalSize, FSlateLayoutTransform(Offset)),
+			InBrush,
+			ESlateDrawEffect::None,
+			InTint
+		);
+	}
+};
+
+
+
+void FMeasuredText::SetText(const FText& InText)
+{
+	CachedText = InText;
+	bTextDirty = true;
+}
+
+FVector2D FMeasuredText::UpdateTextSize(const FSlateFontInfo &InFontInfo, float FontScale) const
+{
+	if (bTextDirty)
+	{
+		bTextDirty = false;
+		CachedTextSize = FSlateApplication::Get().GetRenderer()->GetFontMeasureService()->Measure(CachedText, InFontInfo, FontScale);
+	}
+
+	return CachedTextSize;
+}
+
+UCommonPlayerInputKey::UCommonPlayerInputKey(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+	, BoundKeyFallback(EKeys::Invalid)
+	, InputTypeOverride(ECommonInputType::Count)
+{
+	FrameSize = FVector2D(0, 0);
+}
+
+void UCommonPlayerInputKey::NativePreConstruct()
+{
+	Super::NativePreConstruct();
+
+	UpdateKeybindWidget();
+
+	if (IsDesignTime())
+	{
+		ShowHoldBackPlate();
+		RecalculateDesiredSize();
+	}
+}
+
+void UCommonPlayerInputKey::NativeConstruct()
+{
+	Super::NativeConstruct();
+}
+
+void UCommonPlayerInputKey::NativeDestruct()
+{
+	if (ProgressPercentageMID)
+	{
+		// Need to restore the material on the brush before we kill off the MID.
+		HoldProgressBrush.SetResourceObject(ProgressPercentageMID->GetMaterial());
+
+		ProgressPercentageMID->MarkAsGarbage();
+		ProgressPercentageMID = nullptr;
+	}
+
+	Super::NativeDestruct();
+}
+
+int32 UCommonPlayerInputKey::NativePaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
+{
+	int32 MaxLayer = Super::NativePaint(Args, AllottedGeometry, MyCullingRect, OutDrawElements, LayerId, InWidgetStyle, bParentEnabled);
+
+	if (bDrawProgress)
+	{
+		FSlateDrawUtil::DrawBrushCenterFit
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry,
+			&HoldProgressBrush,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint() * HoldProgressBrush.GetTint(InWidgetStyle))
+		);
+	}
+
+	if (bDrawCountdownText)
+	{
+		const FVector2D CountdownTextOffset = (AllottedGeometry.GetLocalSize() - CountdownText.GetTextSize()) * 0.5f;
+
+		FSlateDrawElement::MakeText
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry.ToOffsetPaintGeometry(CountdownTextOffset),
+			CountdownText.GetText(),
+			CountdownTextFont,
+			ESlateDrawEffect::None,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint())
+		);
+	}
+	else if (bDrawBrushForKey)
+	{
+		// Draw Shadow
+		FSlateDrawUtil::DrawBrushCenterFitWithOffset
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry,
+			&CachedKeyBrush,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint() * FLinearColor::Black),
+			FVector2D(1, 1)
+		);
+
+		FSlateDrawUtil::DrawBrushCenterFit
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry,
+			&CachedKeyBrush,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint() * CachedKeyBrush.GetTint(InWidgetStyle))
+		);
+	}
+	else if (KeybindText.GetTextSize().X > 0)
+	{
+		const FVector2D FrameOffset = (AllottedGeometry.GetLocalSize() - FrameSize) * 0.5f;
+
+		FSlateDrawElement::MakeBox
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry.ToPaintGeometry(FrameSize, FSlateLayoutTransform(FrameOffset)),
+			&KeyBindTextBorder,
+			ESlateDrawEffect::None,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint() * KeyBindTextBorder.GetTint(InWidgetStyle))
+		);
+
+		const FVector2D ActionTextOffset = (AllottedGeometry.GetLocalSize() - KeybindText.GetTextSize()) * 0.5f;
+
+		FSlateDrawElement::MakeText
+		(
+			OutDrawElements,
+			++MaxLayer,
+			AllottedGeometry.ToOffsetPaintGeometry(ActionTextOffset),
+			KeybindText.GetText(),
+			KeyBindTextFont,
+			ESlateDrawEffect::None,
+			FLinearColor(InWidgetStyle.GetColorAndOpacityTint())
+		);
+	}
+
+	return MaxLayer;
+}
+
+void UCommonPlayerInputKey::StartHoldProgress(FName HoldActionName, float HoldDuration)
+{
+	if (HoldActionName == BoundAction && ensureMsgf(HoldDuration > 0.0f, TEXT("Trying to perform hold action \"%s\" with no HoldDuration"), *BoundAction.ToString()))
+	{
+		HoldKeybindDuration = HoldDuration;
+		HoldKeybindStartTime = GetWorld()->GetRealTimeSeconds();
+
+		UpdateHoldProgress();
+	}
+}
+
+void UCommonPlayerInputKey::StopHoldProgress(FName HoldActionName, bool bCompletedSuccessfully)
+{
+	if (HoldActionName == BoundAction)
+	{
+		HoldKeybindStartTime = 0.f;
+		HoldKeybindDuration = 0.f;
+
+		if (ensure(ProgressPercentageMID))
+		{
+			ProgressPercentageMID->SetScalarParameterValue(PercentageMaterialParameterName, 0.f);
+		}
+
+		if (bDrawCountdownText)
+		{
+			bDrawCountdownText = false;
+			Invalidate(EInvalidateWidget::Paint);
+			RecalculateDesiredSize();
+		}
+	}
+}
+
+void UCommonPlayerInputKey::SyncHoldProgress()
+{
+	// If we had an active hold action, stop it
+	if (HoldKeybindStartTime > 0.f)
+	{
+		StopHoldProgress(BoundAction, false);
+	}
+}
+
+void UCommonPlayerInputKey::UpdateHoldProgress()
+{
+	if (HoldKeybindStartTime != 0.f && HoldKeybindDuration > 0.f)
+	{
+		const float CurrentTime = GetWorld()->GetRealTimeSeconds();
+		const float ElapsedTime = FMath::Min(CurrentTime - HoldKeybindStartTime, HoldKeybindDuration);
+		const float RemainingTime = FMath::Max(0.0f, HoldKeybindDuration - ElapsedTime);
+
+		if (ElapsedTime < HoldKeybindDuration && ensure(ProgressPercentageMID))
+		{
+			const float HoldKeybindPercentage = ElapsedTime / HoldKeybindDuration;
+			ProgressPercentageMID->SetScalarParameterValue(PercentageMaterialParameterName, HoldKeybindPercentage);
+
+			// Schedule a callback for next tick to update the hold progress again.
+			GetWorld()->GetTimerManager().SetTimerForNextTick(this, &ThisClass::UpdateHoldProgress);		
+		}
+
+		if (bShowTimeCountDown)
+		{
+			FNumberFormattingOptions Options;
+			Options.MinimumFractionalDigits = 1;
+			Options.MaximumFractionalDigits = 1;
+			CountdownText.SetText(FText::AsNumber(RemainingTime, &Options));
+
+			bDrawCountdownText = true;
+			Invalidate(EInvalidateWidget::Paint);
+			RecalculateDesiredSize();
+		}
+	}
+}
+
+void UCommonPlayerInputKey::UpdateKeybindWidget()
+{
+	if (!GetOwningPlayer<ACommonPlayerController>())
+	{
+		bWaitingForPlayerController = true;
+		return;
+	}
+
+	UCommonInputSubsystem* CommonInputSubsystem = GetInputSubsystem();
+
+	if (CommonInputSubsystem && !CommonInputSubsystem->ShouldShowInputKeys())
+	{
+		SetVisibility(ESlateVisibility::Collapsed);
+		return;
+	}
+
+	const bool bIsUsingGamepad = (InputTypeOverride == ECommonInputType::Gamepad) || ((CommonInputSubsystem != nullptr) && (CommonInputSubsystem->GetCurrentInputType() == ECommonInputType::Gamepad)) ;
+
+	if (!BoundKey.IsValid())
+	{
+		BoundKey = BoundKeyFallback;
+	}
+	UE_LOG(LogCommonPlayerInput, Verbose, TEXT("UCommonKeybindWidget::UpdateKeybindWidget: Action: %s Key: %s"), *(BoundAction.ToString()), *(BoundKey.ToString()));
+
+	// Must be called before Update, due to the creation of ProgressPercentageMID which will be used in Update
+	SetupHoldKeybind();
+
+	bool NewDrawBrushForKey = false;
+	bool NeedToRecalcSize = false;
+
+	if (BoundKey.IsValid())
+	{
+		SetVisibility(ESlateVisibility::HitTestInvisible);
+
+		ShowHoldBackPlate();
+
+		NeedToRecalcSize = true;
+	}
+	else
+	{
+		if (bShowUnboundStatus)
+		{
+			SetVisibility(ESlateVisibility::HitTestInvisible);
+			NewDrawBrushForKey = false;
+
+			KeybindText.SetText(LOCTEXT("Unbound", "Unbound"));
+
+			NeedToRecalcSize = true;
+		}
+		else
+		{
+			SetVisibility(ESlateVisibility::Collapsed);
+		}
+	}
+
+	if (bDrawBrushForKey != NewDrawBrushForKey)
+	{
+		bDrawBrushForKey = NewDrawBrushForKey;
+		Invalidate(EInvalidateWidget::Paint);
+	}
+
+	// As RecalculateDesiredSize relies on the bDrawBrushForKey 
+	// we shouldn't call it until that value has been finalized
+	// for the update
+	if (NeedToRecalcSize)
+	{
+		RecalculateDesiredSize();
+	}
+}
+
+void UCommonPlayerInputKey::SetBoundKey(FKey NewKey)
+{
+	if (NewKey != BoundKey)
+	{
+		BoundKeyFallback = NewKey;
+		BoundAction = NAME_None;
+		UpdateKeybindWidget();
+	}
+}
+
+void UCommonPlayerInputKey::SetBoundAction(FName NewBoundAction)
+{
+	bool bUpdateWidget = true;
+
+	if (BoundAction != NewBoundAction)
+	{
+		BoundAction = NewBoundAction;
+	}
+
+	if (bUpdateWidget)
+	{
+		UpdateKeybindWidget();
+	}
+}
+
+void UCommonPlayerInputKey::NativeOnInitialized()
+{
+	Super::NativeOnInitialized();
+
+	if (UCommonLocalPlayer* CommonLocalPlayer = GetOwningLocalPlayer<UCommonLocalPlayer>())
+	{
+		CommonLocalPlayer->OnPlayerControllerSet.AddUObject(this, &ThisClass::HandlePlayerControllerSet);
+	}
+}
+
+void UCommonPlayerInputKey::SetForcedHoldKeybindStatus(ECommonKeybindForcedHoldStatus InForcedHoldKeybindStatus)
+{
+	ForcedHoldKeybindStatus = InForcedHoldKeybindStatus;
+
+	UpdateKeybindWidget();
+}
+
+void UCommonPlayerInputKey::SetShowProgressCountDown(bool bShow)
+{
+	bShowTimeCountDown = bShow;
+}
+
+void UCommonPlayerInputKey::SetupHoldKeybind()
+{
+	ACommonPlayerController* OwningCommonPlayer = Cast<ACommonPlayerController>(GetOwningPlayer());
+
+	// Setup the hold
+	if (ForcedHoldKeybindStatus == ECommonKeybindForcedHoldStatus::ForcedHold)
+	{
+		bIsHoldKeybind = true;
+	}
+	else if (ForcedHoldKeybindStatus == ECommonKeybindForcedHoldStatus::NeverShowHold)
+	{
+		bIsHoldKeybind = false;
+	}
+
+	if (ensure(OwningCommonPlayer))
+	{
+		if (bIsHoldKeybind)
+		{
+			// Setup the ProgressPercentageMID
+			if (ProgressPercentageMID == nullptr)
+			{
+				if (UMaterialInterface* Material = Cast<UMaterialInterface>(HoldProgressBrush.GetResourceObject()))
+				{
+					ProgressPercentageMID = UMaterialInstanceDynamic::Create(Material, this);
+					HoldProgressBrush.SetResourceObject(ProgressPercentageMID);
+				}
+			}
+			SyncHoldProgress();
+		}
+	}
+}
+
+void UCommonPlayerInputKey::ShowHoldBackPlate()
+{
+	bool bDirty = false;
+
+	if (IsHoldKeybind())
+	{
+		float BrushSizeAsValue = 32.0f;
+		
+		float DesiredBoxSize = BrushSizeAsValue + 10.0f;
+		if (!bDrawBrushForKey)
+		{
+			DesiredBoxSize += 14.0f;
+		}
+
+		const FVector2D NewDesiredBrushSize(DesiredBoxSize, DesiredBoxSize);
+		if (HoldProgressBrush.GetImageSize() != NewDesiredBrushSize)
+		{
+			HoldProgressBrush.SetImageSize(NewDesiredBrushSize);
+			bDirty = true;
+		}
+
+		if (!bDrawProgress)
+		{
+			bDrawProgress = true;
+			bDirty = true;
+		}
+
+		static const FName BackAlphaName = TEXT("BackAlpha");
+		static const FName OutlineAlphaName = TEXT("OutlineAlpha");
+
+		if (ProgressPercentageMID)
+		{
+			ProgressPercentageMID->SetScalarParameterValue(BackAlphaName, 0.2f);
+			ProgressPercentageMID->SetScalarParameterValue(OutlineAlphaName, 0.4f);
+		}
+	}
+	else
+	{
+		if (bDrawProgress)
+		{
+			bDrawProgress = false;
+			bDirty = true;
+		}
+	}
+
+	if (bDirty)
+	{
+		Invalidate(EInvalidateWidget::Paint);
+	}
+}
+
+void UCommonPlayerInputKey::HandlePlayerControllerSet(UCommonLocalPlayer* LocalPlayer, APlayerController* PlayerController)
+{
+	if (bWaitingForPlayerController && GetOwningPlayer<ACommonPlayerController>())
+	{
+		UpdateKeybindWidget();
+		bWaitingForPlayerController = false;
+	}
+}
+
+void UCommonPlayerInputKey::RecalculateDesiredSize()
+{
+	FVector2D MaximumDesiredSize(0, 0);
+	float LayoutScale = 1;
+
+	if (bDrawProgress)
+	{
+		MaximumDesiredSize = FVector2D::Max(MaximumDesiredSize, HoldProgressBrush.GetImageSize());
+	}
+
+	if (bDrawCountdownText)
+	{
+		MaximumDesiredSize = FVector2D::Max(MaximumDesiredSize, CountdownText.UpdateTextSize(CountdownTextFont, LayoutScale));
+	}
+	else if (bDrawBrushForKey)
+	{
+		MaximumDesiredSize = FVector2D::Max(MaximumDesiredSize, CachedKeyBrush.GetImageSize());
+	}
+	else
+	{
+		const FVector2D KeybindTextSize = KeybindText.UpdateTextSize(KeyBindTextFont, LayoutScale);
+		FrameSize = FVector2D::Max(KeybindTextSize, KeybindFrameMinimumSize) + KeybindTextPadding.GetDesiredSize();
+		MaximumDesiredSize = FVector2D::Max(MaximumDesiredSize, FrameSize);
+	}
+
+	SetMinimumDesiredSize(MaximumDesiredSize);
+}
+
+#undef LOCTEXT_NAMESPACE
+
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonUIExtensions.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonUIExtensions.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d84e7e33c60b42095340b82042941ad4625ce4b3
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/CommonUIExtensions.cpp
@@ -0,0 +1,171 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonUIExtensions.h"
+
+#include "CommonInputSubsystem.h"
+#include "CommonInputTypeEnum.h"
+#include "CommonLocalPlayer.h"
+#include "Engine/GameInstance.h"
+#include "GameUIManagerSubsystem.h"
+#include "GameUIPolicy.h"
+#include "PrimaryGameLayout.h"
+#include "Widgets/CommonActivatableWidgetContainer.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonUIExtensions)
+
+int32 UCommonUIExtensions::InputSuspensions = 0;
+
+ECommonInputType UCommonUIExtensions::GetOwningPlayerInputType(const UUserWidget* WidgetContextObject)
+{
+	if (WidgetContextObject)
+	{
+		if (const UCommonInputSubsystem* InputSubsystem = UCommonInputSubsystem::Get(WidgetContextObject->GetOwningLocalPlayer()))
+		{
+			return InputSubsystem->GetCurrentInputType();
+		}
+	}
+
+	return ECommonInputType::Count;
+}
+
+bool UCommonUIExtensions::IsOwningPlayerUsingTouch(const UUserWidget* WidgetContextObject)
+{
+	if (WidgetContextObject)
+	{
+		if (const UCommonInputSubsystem* InputSubsystem = UCommonInputSubsystem::Get(WidgetContextObject->GetOwningLocalPlayer()))
+		{
+			return InputSubsystem->GetCurrentInputType() == ECommonInputType::Touch;
+		}
+	}
+	return false;
+}
+
+bool UCommonUIExtensions::IsOwningPlayerUsingGamepad(const UUserWidget* WidgetContextObject)
+{
+	if (WidgetContextObject)
+	{
+		if (const UCommonInputSubsystem* InputSubsystem = UCommonInputSubsystem::Get(WidgetContextObject->GetOwningLocalPlayer()))
+		{
+			return InputSubsystem->GetCurrentInputType() == ECommonInputType::Gamepad;
+		}
+	}
+	return false;
+}
+
+UCommonActivatableWidget* UCommonUIExtensions::PushContentToLayer_ForPlayer(const ULocalPlayer* LocalPlayer, FGameplayTag LayerName, TSubclassOf<UCommonActivatableWidget> WidgetClass)
+{
+	if (!ensure(LocalPlayer) || !ensure(WidgetClass != nullptr))
+	{
+		return nullptr;
+	}
+
+	if (UGameUIManagerSubsystem* UIManager = LocalPlayer->GetGameInstance()->GetSubsystem<UGameUIManagerSubsystem>())
+	{
+		if (UGameUIPolicy* Policy = UIManager->GetCurrentUIPolicy())
+		{
+			if (UPrimaryGameLayout* RootLayout = Policy->GetRootLayout(CastChecked<UCommonLocalPlayer>(LocalPlayer)))
+			{
+				return RootLayout->PushWidgetToLayerStack(LayerName, WidgetClass);
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+void UCommonUIExtensions::PushStreamedContentToLayer_ForPlayer(const ULocalPlayer* LocalPlayer, FGameplayTag LayerName, TSoftClassPtr<UCommonActivatableWidget> WidgetClass)
+{
+	if (!ensure(LocalPlayer) || !ensure(!WidgetClass.IsNull()))
+	{
+		return;
+	}
+
+	if (UGameUIManagerSubsystem* UIManager = LocalPlayer->GetGameInstance()->GetSubsystem<UGameUIManagerSubsystem>())
+	{
+		if (UGameUIPolicy* Policy = UIManager->GetCurrentUIPolicy())
+		{
+			if (UPrimaryGameLayout* RootLayout = Policy->GetRootLayout(CastChecked<UCommonLocalPlayer>(LocalPlayer)))
+			{
+				const bool bSuspendInputUntilComplete = true;
+				RootLayout->PushWidgetToLayerStackAsync(LayerName, bSuspendInputUntilComplete, WidgetClass);
+			}
+		}
+	}
+}
+
+void UCommonUIExtensions::PopContentFromLayer(UCommonActivatableWidget* ActivatableWidget)
+{
+	if (!ActivatableWidget)
+	{
+		// Ignore request to pop an already deleted widget
+		return;
+	}
+
+	if (const ULocalPlayer* LocalPlayer = ActivatableWidget->GetOwningLocalPlayer())
+	{
+		if (const UGameUIManagerSubsystem* UIManager = LocalPlayer->GetGameInstance()->GetSubsystem<UGameUIManagerSubsystem>())
+		{
+			if (const UGameUIPolicy* Policy = UIManager->GetCurrentUIPolicy())
+			{
+				if (UPrimaryGameLayout* RootLayout = Policy->GetRootLayout(CastChecked<UCommonLocalPlayer>(LocalPlayer)))
+				{
+					RootLayout->FindAndRemoveWidgetFromLayer(ActivatableWidget);
+				}
+			}
+		}
+	}
+}
+
+ULocalPlayer* UCommonUIExtensions::GetLocalPlayerFromController(APlayerController* PlayerController)
+{
+	if (PlayerController)
+	{
+		return Cast<ULocalPlayer>(PlayerController->Player);
+	}
+
+	return nullptr;
+}
+
+FName UCommonUIExtensions::SuspendInputForPlayer(APlayerController* PlayerController, FName SuspendReason)
+{
+	return SuspendInputForPlayer(PlayerController ? PlayerController->GetLocalPlayer() : nullptr, SuspendReason);
+}
+
+FName UCommonUIExtensions::SuspendInputForPlayer(ULocalPlayer* LocalPlayer, FName SuspendReason)
+{
+	if (UCommonInputSubsystem* CommonInputSubsystem = UCommonInputSubsystem::Get(LocalPlayer))
+	{
+		InputSuspensions++;
+		FName SuspendToken = SuspendReason;
+		SuspendToken.SetNumber(InputSuspensions);
+
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::MouseAndKeyboard, SuspendToken, true);
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::Gamepad, SuspendToken, true);
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::Touch, SuspendToken, true);
+
+		return SuspendToken;
+	}
+
+	return NAME_None;
+}
+
+void UCommonUIExtensions::ResumeInputForPlayer(APlayerController* PlayerController, FName SuspendToken)
+{
+	ResumeInputForPlayer(PlayerController ? PlayerController->GetLocalPlayer() : nullptr, SuspendToken);
+}
+
+void UCommonUIExtensions::ResumeInputForPlayer(ULocalPlayer* LocalPlayer, FName SuspendToken)
+{
+	if (SuspendToken == NAME_None)
+	{
+		return;
+	}
+
+	if (UCommonInputSubsystem* CommonInputSubsystem = UCommonInputSubsystem::Get(LocalPlayer))
+	{
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::MouseAndKeyboard, SuspendToken, false);
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::Gamepad, SuspendToken, false);
+		CommonInputSubsystem->SetInputTypeFilter(ECommonInputType::Touch, SuspendToken, false);
+	}
+}
+
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIManagerSubsystem.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIManagerSubsystem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5e53400589b085f0ed601d23f76010ac98c307c9
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIManagerSubsystem.cpp
@@ -0,0 +1,76 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "GameUIManagerSubsystem.h"
+
+#include "Engine/GameInstance.h"
+#include "GameUIPolicy.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(GameUIManagerSubsystem)
+
+class FSubsystemCollectionBase;
+class UClass;
+
+void UGameUIManagerSubsystem::Initialize(FSubsystemCollectionBase& Collection)
+{
+	Super::Initialize(Collection);
+
+	if (!CurrentPolicy && !DefaultUIPolicyClass.IsNull())
+	{
+		TSubclassOf<UGameUIPolicy> PolicyClass = DefaultUIPolicyClass.LoadSynchronous();
+		SwitchToPolicy(NewObject<UGameUIPolicy>(this, PolicyClass));
+	}
+}
+
+void UGameUIManagerSubsystem::Deinitialize()
+{
+	Super::Deinitialize();
+
+	SwitchToPolicy(nullptr);
+}
+
+bool UGameUIManagerSubsystem::ShouldCreateSubsystem(UObject* Outer) const
+{
+	if (!CastChecked<UGameInstance>(Outer)->IsDedicatedServerInstance())
+	{
+		TArray<UClass*> ChildClasses;
+		GetDerivedClasses(GetClass(), ChildClasses, false);
+
+		// Only create an instance if there is no override implementation defined elsewhere
+		return ChildClasses.Num() == 0;
+	}
+
+	return false;
+}
+
+void UGameUIManagerSubsystem::NotifyPlayerAdded(UCommonLocalPlayer* LocalPlayer)
+{
+	if (ensure(LocalPlayer) && CurrentPolicy)
+	{
+		CurrentPolicy->NotifyPlayerAdded(LocalPlayer);
+	}
+}
+
+void UGameUIManagerSubsystem::NotifyPlayerRemoved(UCommonLocalPlayer* LocalPlayer)
+{
+	if (LocalPlayer && CurrentPolicy)
+	{
+		CurrentPolicy->NotifyPlayerRemoved(LocalPlayer);
+	}
+}
+
+void UGameUIManagerSubsystem::NotifyPlayerDestroyed(UCommonLocalPlayer* LocalPlayer)
+{
+	if (LocalPlayer && CurrentPolicy)
+	{
+		CurrentPolicy->NotifyPlayerDestroyed(LocalPlayer);
+	}
+}
+
+void UGameUIManagerSubsystem::SwitchToPolicy(UGameUIPolicy* InPolicy)
+{
+	if (CurrentPolicy != InPolicy)
+	{
+		CurrentPolicy = InPolicy;
+	}
+}
+
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIPolicy.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIPolicy.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2fea776b47669edb8bfd332759e9b2ae348435b8
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/GameUIPolicy.cpp
@@ -0,0 +1,203 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "GameUIPolicy.h"
+#include "Engine/GameInstance.h"
+#include "Framework/Application/SlateApplication.h"
+#include "GameUIManagerSubsystem.h"
+#include "CommonLocalPlayer.h"
+#include "PrimaryGameLayout.h"
+#include "Engine/Engine.h"
+#include "LogCommonGame.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(GameUIPolicy)
+
+// Static
+UGameUIPolicy* UGameUIPolicy::GetGameUIPolicy(const UObject* WorldContextObject)
+{
+	if (UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull))
+	{
+		if (UGameInstance* GameInstance = World->GetGameInstance())
+		{
+			if (UGameUIManagerSubsystem* UIManager = UGameInstance::GetSubsystem<UGameUIManagerSubsystem>(GameInstance))
+			{
+				return UIManager->GetCurrentUIPolicy();
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+UGameUIManagerSubsystem* UGameUIPolicy::GetOwningUIManager() const
+{
+	return CastChecked<UGameUIManagerSubsystem>(GetOuter());
+}
+
+UWorld* UGameUIPolicy::GetWorld() const
+{
+	return GetOwningUIManager()->GetGameInstance()->GetWorld();
+}
+
+UPrimaryGameLayout* UGameUIPolicy::GetRootLayout(const UCommonLocalPlayer* LocalPlayer) const
+{
+	const FRootViewportLayoutInfo* LayoutInfo = RootViewportLayouts.FindByKey(LocalPlayer);
+	return LayoutInfo ? LayoutInfo->RootLayout : nullptr;
+}
+
+void UGameUIPolicy::NotifyPlayerAdded(UCommonLocalPlayer* LocalPlayer)
+{
+	LocalPlayer->OnPlayerControllerSet.AddWeakLambda(this, [this](UCommonLocalPlayer* LocalPlayer, APlayerController* PlayerController)
+	{
+		NotifyPlayerRemoved(LocalPlayer);
+
+		if (FRootViewportLayoutInfo* LayoutInfo = RootViewportLayouts.FindByKey(LocalPlayer))
+		{
+			AddLayoutToViewport(LocalPlayer, LayoutInfo->RootLayout);
+			LayoutInfo->bAddedToViewport = true;
+		}
+		else
+		{
+			CreateLayoutWidget(LocalPlayer);
+		}
+	});
+
+	if (FRootViewportLayoutInfo* LayoutInfo = RootViewportLayouts.FindByKey(LocalPlayer))
+	{
+		AddLayoutToViewport(LocalPlayer, LayoutInfo->RootLayout);
+		LayoutInfo->bAddedToViewport = true;
+	}
+	else
+	{
+		CreateLayoutWidget(LocalPlayer);
+	}
+}
+
+void UGameUIPolicy::NotifyPlayerRemoved(UCommonLocalPlayer* LocalPlayer)
+{
+	if (FRootViewportLayoutInfo* LayoutInfo = RootViewportLayouts.FindByKey(LocalPlayer))
+	{
+		RemoveLayoutFromViewport(LocalPlayer, LayoutInfo->RootLayout);
+		LayoutInfo->bAddedToViewport = false;
+
+		if (LocalMultiplayerInteractionMode == ELocalMultiplayerInteractionMode::SingleToggle && !LocalPlayer->IsPrimaryPlayer())
+		{
+			UPrimaryGameLayout* RootLayout = LayoutInfo->RootLayout;
+			if (RootLayout && !RootLayout->IsDormant())
+			{
+				// We're removing a secondary player's root while it's in control - transfer control back to the primary player's root
+				RootLayout->SetIsDormant(true);
+				for (const FRootViewportLayoutInfo& RootLayoutInfo : RootViewportLayouts)
+				{
+					if (RootLayoutInfo.LocalPlayer->IsPrimaryPlayer())
+					{
+						if (UPrimaryGameLayout* PrimaryRootLayout = RootLayoutInfo.RootLayout)
+						{
+							PrimaryRootLayout->SetIsDormant(false);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void UGameUIPolicy::NotifyPlayerDestroyed(UCommonLocalPlayer* LocalPlayer)
+{
+	NotifyPlayerRemoved(LocalPlayer);
+	LocalPlayer->OnPlayerControllerSet.RemoveAll(this);
+	const int32 LayoutInfoIdx = RootViewportLayouts.IndexOfByKey(LocalPlayer);
+	if (LayoutInfoIdx != INDEX_NONE)
+	{
+		UPrimaryGameLayout* Layout = RootViewportLayouts[LayoutInfoIdx].RootLayout;
+		RootViewportLayouts.RemoveAt(LayoutInfoIdx);
+
+		RemoveLayoutFromViewport(LocalPlayer, Layout);
+
+		OnRootLayoutReleased(LocalPlayer, Layout);
+	}
+}
+
+void UGameUIPolicy::AddLayoutToViewport(UCommonLocalPlayer* LocalPlayer, UPrimaryGameLayout* Layout)
+{
+	UE_LOG(LogCommonGame, Log, TEXT("[%s] is adding player [%s]'s root layout [%s] to the viewport"), *GetName(), *GetNameSafe(LocalPlayer), *GetNameSafe(Layout));
+
+	Layout->SetPlayerContext(FLocalPlayerContext(LocalPlayer));
+	Layout->AddToPlayerScreen(1000);
+
+	OnRootLayoutAddedToViewport(LocalPlayer, Layout);
+}
+
+void UGameUIPolicy::RemoveLayoutFromViewport(UCommonLocalPlayer* LocalPlayer, UPrimaryGameLayout* Layout)
+{
+	TWeakPtr<SWidget> LayoutSlateWidget = Layout->GetCachedWidget();
+	if (LayoutSlateWidget.IsValid())
+	{
+		UE_LOG(LogCommonGame, Log, TEXT("[%s] is removing player [%s]'s root layout [%s] from the viewport"), *GetName(), *GetNameSafe(LocalPlayer), *GetNameSafe(Layout));
+
+		Layout->RemoveFromParent();
+		if (LayoutSlateWidget.IsValid())
+		{
+			UE_LOG(LogCommonGame, Log, TEXT("Player [%s]'s root layout [%s] has been removed from the viewport, but other references to its underlying Slate widget still exist. Noting in case we leak it."), *GetNameSafe(LocalPlayer), *GetNameSafe(Layout));
+		}
+
+		OnRootLayoutRemovedFromViewport(LocalPlayer, Layout);
+	}
+}
+
+void UGameUIPolicy::OnRootLayoutAddedToViewport(UCommonLocalPlayer* LocalPlayer, UPrimaryGameLayout* Layout)
+{
+#if WITH_EDITOR
+	if (GIsEditor && LocalPlayer->IsPrimaryPlayer())
+	{
+		// So our controller will work in PIE without needing to click in the viewport
+		FSlateApplication::Get().SetUserFocusToGameViewport(0);
+	}
+#endif
+}
+
+void UGameUIPolicy::OnRootLayoutRemovedFromViewport(UCommonLocalPlayer* LocalPlayer, UPrimaryGameLayout* Layout)
+{
+	
+}
+
+void UGameUIPolicy::OnRootLayoutReleased(UCommonLocalPlayer* LocalPlayer, UPrimaryGameLayout* Layout)
+{
+	
+}
+
+void UGameUIPolicy::RequestPrimaryControl(UPrimaryGameLayout* Layout)
+{
+	if (LocalMultiplayerInteractionMode == ELocalMultiplayerInteractionMode::SingleToggle && Layout->IsDormant())
+	{
+		for (const FRootViewportLayoutInfo& LayoutInfo : RootViewportLayouts)
+		{
+			UPrimaryGameLayout* RootLayout = LayoutInfo.RootLayout;
+			if (RootLayout && !RootLayout->IsDormant())
+			{
+				RootLayout->SetIsDormant(true);
+				break;
+			}
+		}
+		Layout->SetIsDormant(false);
+	}
+}
+
+void UGameUIPolicy::CreateLayoutWidget(UCommonLocalPlayer* LocalPlayer)
+{
+	if (APlayerController* PlayerController = LocalPlayer->GetPlayerController(GetWorld()))
+	{
+		TSubclassOf<UPrimaryGameLayout> LayoutWidgetClass = GetLayoutWidgetClass(LocalPlayer);
+		if (ensure(LayoutWidgetClass && !LayoutWidgetClass->HasAnyClassFlags(CLASS_Abstract)))
+		{
+			UPrimaryGameLayout* NewLayoutObject = CreateWidget<UPrimaryGameLayout>(PlayerController, LayoutWidgetClass);
+			RootViewportLayouts.Emplace(LocalPlayer, NewLayoutObject, true);
+			
+			AddLayoutToViewport(LocalPlayer, NewLayoutObject);
+		}
+	}
+}
+
+TSubclassOf<UPrimaryGameLayout> UGameUIPolicy::GetLayoutWidgetClass(UCommonLocalPlayer* LocalPlayer)
+{
+	return LayoutClass.LoadSynchronous();
+}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..69e26fe878ed53b8f0bd98f05a44040c6070d7d3
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.cpp
@@ -0,0 +1,5 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "LogCommonGame.h"
+
+DEFINE_LOG_CATEGORY(LogCommonGame);
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.h b/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.h
new file mode 100644
index 0000000000000000000000000000000000000000..34d8acd76c57a9b2587a790b73295bd09292ea2b
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/LogCommonGame.h
@@ -0,0 +1,7 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Logging/LogMacros.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogCommonGame, Log, All);
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Private/PrimaryGameLayout.cpp b/LyraStarterGame/Plugins/CommonGame/Source/Private/PrimaryGameLayout.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6708e6a45e41cf631cc396028cd3f8e392c461a0
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Private/PrimaryGameLayout.cpp
@@ -0,0 +1,132 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "PrimaryGameLayout.h"
+
+#include "CommonLocalPlayer.h"
+#include "Engine/GameInstance.h"
+#include "GameUIManagerSubsystem.h"
+#include "GameUIPolicy.h"
+#include "Kismet/GameplayStatics.h"
+#include "LogCommonGame.h"
+#include "Widgets/CommonActivatableWidgetContainer.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(PrimaryGameLayout)
+
+class UObject;
+
+/*static*/ UPrimaryGameLayout* UPrimaryGameLayout::GetPrimaryGameLayoutForPrimaryPlayer(const UObject* WorldContextObject)
+{
+	UGameInstance* GameInstance = UGameplayStatics::GetGameInstance(WorldContextObject);
+	APlayerController* PlayerController = GameInstance->GetPrimaryPlayerController(false);
+	return GetPrimaryGameLayout(PlayerController);
+}
+
+/*static*/ UPrimaryGameLayout* UPrimaryGameLayout::GetPrimaryGameLayout(APlayerController* PlayerController)
+{
+	return PlayerController ? GetPrimaryGameLayout(Cast<UCommonLocalPlayer>(PlayerController->Player)) : nullptr;
+}
+
+/*static*/ UPrimaryGameLayout* UPrimaryGameLayout::GetPrimaryGameLayout(ULocalPlayer* LocalPlayer)
+{
+	if (LocalPlayer)
+	{
+		const UCommonLocalPlayer* CommonLocalPlayer = CastChecked<UCommonLocalPlayer>(LocalPlayer);
+		if (const UGameInstance* GameInstance = CommonLocalPlayer->GetGameInstance())
+		{
+			if (UGameUIManagerSubsystem* UIManager = GameInstance->GetSubsystem<UGameUIManagerSubsystem>())
+			{
+				if (const UGameUIPolicy* Policy = UIManager->GetCurrentUIPolicy())
+				{
+					if (UPrimaryGameLayout* RootLayout = Policy->GetRootLayout(CommonLocalPlayer))
+					{
+						return RootLayout;
+					}
+				}
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+UPrimaryGameLayout::UPrimaryGameLayout(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void UPrimaryGameLayout::SetIsDormant(bool InDormant)
+{
+	if (bIsDormant != InDormant)
+	{
+		const ULocalPlayer* LP = GetOwningLocalPlayer();
+		const int32 PlayerId = LP ? LP->GetControllerId() : -1;
+		const TCHAR* OldDormancyStr = bIsDormant ? TEXT("Dormant") : TEXT("Not-Dormant");
+		const TCHAR* NewDormancyStr = InDormant ? TEXT("Dormant") : TEXT("Not-Dormant");
+		const TCHAR* PrimaryPlayerStr = LP && LP->IsPrimaryPlayer() ? TEXT("[Primary]") : TEXT("[Non-Primary]");
+		UE_LOG(LogCommonGame, Display, TEXT("%s PrimaryGameLayout Dormancy changed for [%d] from [%s] to [%s]"), PrimaryPlayerStr, PlayerId, OldDormancyStr, NewDormancyStr);
+
+		bIsDormant = InDormant;
+		OnIsDormantChanged();
+	}
+}
+
+void UPrimaryGameLayout::OnIsDormantChanged()
+{
+	//@TODO NDarnell Determine what to do with dormancy, in the past we treated dormancy as a way to shutoff rendering
+	//and the view for the other local players when we force multiple players to use the player view of a single player.
+	
+	//if (UCommonLocalPlayer* LocalPlayer = GetOwningLocalPlayer<UCommonLocalPlayer>())
+	//{
+	//	// When the root layout is dormant, we don't want to render anything from the owner's view either
+	//	LocalPlayer->SetIsPlayerViewEnabled(!bIsDormant);
+	//}
+
+	//SetVisibility(bIsDormant ? ESlateVisibility::Collapsed : ESlateVisibility::SelfHitTestInvisible);
+
+	//OnLayoutDormancyChanged().Broadcast(bIsDormant);
+}
+
+void UPrimaryGameLayout::RegisterLayer(FGameplayTag LayerTag, UCommonActivatableWidgetContainerBase* LayerWidget)
+{
+	if (!IsDesignTime())
+	{
+		LayerWidget->OnTransitioningChanged.AddUObject(this, &UPrimaryGameLayout::OnWidgetStackTransitioning);
+		// TODO: Consider allowing a transition duration, we currently set it to 0, because if it's not 0, the
+		//       transition effect will cause focus to not transition properly to the new widgets when using
+		//       gamepad always.
+		LayerWidget->SetTransitionDuration(0.0);
+
+		Layers.Add(LayerTag, LayerWidget);
+	}
+}
+
+void UPrimaryGameLayout::OnWidgetStackTransitioning(UCommonActivatableWidgetContainerBase* Widget, bool bIsTransitioning)
+{
+	if (bIsTransitioning)
+	{
+		const FName SuspendToken = UCommonUIExtensions::SuspendInputForPlayer(GetOwningLocalPlayer(), TEXT("GlobalStackTransion"));
+		SuspendInputTokens.Add(SuspendToken);
+	}
+	else
+	{
+		if (ensure(SuspendInputTokens.Num() > 0))
+		{
+			const FName SuspendToken = SuspendInputTokens.Pop();
+			UCommonUIExtensions::ResumeInputForPlayer(GetOwningLocalPlayer(), SuspendToken);
+		}
+	}
+}
+
+void UPrimaryGameLayout::FindAndRemoveWidgetFromLayer(UCommonActivatableWidget* ActivatableWidget)
+{
+	// We're not sure what layer the widget is on so go searching.
+	for (const auto& LayerKVP : Layers)
+	{
+		LayerKVP.Value->RemoveWidget(*ActivatableWidget);
+	}
+}
+
+UCommonActivatableWidgetContainerBase* UPrimaryGameLayout::GetLayerWidget(FGameplayTag LayerName)
+{
+	return Layers.FindRef(LayerName);
+}
diff --git a/LyraStarterGame/Plugins/CommonGame/Source/Public/CommonGameInstance.h b/LyraStarterGame/Plugins/CommonGame/Source/Public/CommonGameInstance.h
new file mode 100644
index 0000000000000000000000000000000000000000..dffeead7f7d2f5b5dac5f45516fbc96261c3b309
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonGame/Source/Public/CommonGameInstance.h
@@ -0,0 +1,82 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/GameInstance.h"
+
+#include "CommonGameInstance.generated.h"
+
+#define UE_API COMMONGAME_API
+
+enum class ECommonUserAvailability : uint8;
+enum class ECommonUserPrivilege : uint8;
+
+class FText;
+class UCommonUserInfo;
+class UCommonSession_SearchResult;
+struct FOnlineResultInformation;
+class ULocalPlayer;
+class USocialManager;
+class UObject;
+struct FFrame;
+struct FGameplayTag;
+
+UCLASS(MinimalAPI, Abstract, Config = Game)
+class UCommonGameInstance : public UGameInstance
+{
+	GENERATED_BODY()
+
+public:
+	UE_API UCommonGameInstance(const FObjectInitializer& ObjectInitializer);
+	
+	/** Handles errors/warnings from CommonUser, can be overridden per game */
+	UFUNCTION()
+	UE_API virtual void HandleSystemMessage(FGameplayTag MessageType, FText Title, FText Message);
+
+	UFUNCTION()
+	UE_API virtual void HandlePrivilegeChanged(const UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserAvailability OldAvailability, ECommonUserAvailability NewAvailability);
+
+	UFUNCTION()
+	UE_API virtual void HandlerUserInitialized(const UCommonUserInfo* UserInfo, bool bSuccess, FText Error, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext OnlineContext);
+
+	/** Call to reset user and session state, usually because a player has been disconnected */
+	UE_API virtual void ResetUserAndSessionState();
+
+	/**
+	 * Requested Session Flow
+	 *   Something requests the user to join a specific session (for example, a platform overlay via OnUserRequestedSession).
+	 *   This request is handled in SetRequestedSession.
+	 *   Check if we can join the requested session immediately (CanJoinRequestedSession).  If we can, join the requested session (JoinRequestedSession)
+	 *   If not, cache the requested session and instruct the game to get into a state where the session can be joined (ResetGameAndJoinRequestedSession)
+	 */
+	/** Handles user accepting a session invite from an external source (for example, a platform overlay). Intended to be overridden per game. */
+	UE_API virtual void OnUserRequestedSession(const FPlatformUserId& PlatformUserId, UCommonSession_SearchResult* InRequestedSession, const FOnlineResultInformation& RequestedSessionResult);
+
+	/** Handles OSS request that the session be destroyed */
+	UE_API virtual void OnDestroySessionRequested(const FPlatformUserId& PlatformUserId, const FName& SessionName);
+
+	/** Get the requested session */
+	UCommonSession_SearchResult* GetRequestedSession() const { return RequestedSession; }
+	/** Set (or clear) the requested session. When this is set, the requested session flow begins. */
+	UE_API virtual void SetRequestedSession(UCommonSession_SearchResult* InRequestedSession);
+	/** Checks if the requested session can be joined. Can be overridden per game. */
+	UE_API virtual bool CanJoinRequestedSession() const;
+	/** Join the requested session */
+	UE_API virtual void JoinRequestedSession();
+	/** Get the game into a state to join the requested session */
+	UE_API virtual void ResetGameAndJoinRequestedSession();
+	
+	UE_API virtual int32 AddLocalPlayer(ULocalPlayer* NewPlayer, FPlatformUserId UserId) override;
+	UE_API virtual bool RemoveLocalPlayer(ULocalPlayer* ExistingPlayer) override;
+	UE_API virtual void Init() override;
+	UE_API virtual void ReturnToMainMenu() override;
+
+private:
+	/** This is the primary player*/
+	TWeakObjectPtr<ULocalPlayer> PrimaryPlayer;
+	/** Session the player has requested to join */
+	UPROPERTY()
+	TObjectPtr<UCommonSession_SearchResult> RequestedSession;
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Binaries/Win64/UnrealEditor.modules b/LyraStarterGame/Plugins/CommonLoadingScreen/Binaries/Win64/UnrealEditor.modules
new file mode 100644
index 0000000000000000000000000000000000000000..05a759fba014b73c7b6df4d3bc8f0ce9f251eb53
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Binaries/Win64/UnrealEditor.modules
@@ -0,0 +1,8 @@
+{
+	"BuildId": "43139311",
+	"Modules": 
+	{
+		"CommonLoadingScreen": "UnrealEditor-CommonLoadingScreen.dll",
+		"CommonStartupLoadingScreen": "UnrealEditor-CommonStartupLoadingScreen.dll"
+	}
+}
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/CommonLoadingScreen.Build.cs b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/CommonLoadingScreen.Build.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a7aea34a73e5a95ce80c41c8b78c0e272742a858
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/CommonLoadingScreen.Build.cs
@@ -0,0 +1,57 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class CommonLoadingScreen : ModuleRules
+{
+	public CommonLoadingScreen(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+				
+		
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+			
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				// ... add other public dependencies that you statically link with here ...
+			}
+			);
+			
+		
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				"InputCore",
+				"PreLoadScreen",
+				"RenderCore",
+				"DeveloperSettings",
+				"UMG"
+			}
+			);
+		
+		
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenModule.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenModule.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ccdafd74a64ca47315233c893668562b601d0689
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenModule.cpp
@@ -0,0 +1,5 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "Modules/ModuleManager.h"
+
+IMPLEMENT_MODULE(FDefaultModuleImpl, CommonLoadingScreen)
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..226f3246fdbc8e495f1be524d17b60cc66833b1a
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.cpp
@@ -0,0 +1,12 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonLoadingScreenSettings.h"
+
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonLoadingScreenSettings)
+
+UCommonLoadingScreenSettings::UCommonLoadingScreenSettings()
+{
+	CategoryName = TEXT("Game");
+}
+
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.h
new file mode 100644
index 0000000000000000000000000000000000000000..35ec1ad84dbebfb2570c7da207f1b84e77e98869
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/CommonLoadingScreenSettings.h
@@ -0,0 +1,67 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/DeveloperSettingsBackedByCVars.h"
+#include "UObject/SoftObjectPath.h"
+
+#include "CommonLoadingScreenSettings.generated.h"
+
+class UObject;
+
+/**
+ * Settings for a loading screen system.
+ */
+UCLASS(config=Game, defaultconfig, meta=(DisplayName="Common Loading Screen"))
+class UCommonLoadingScreenSettings : public UDeveloperSettingsBackedByCVars
+{
+	GENERATED_BODY()
+
+public:
+	UCommonLoadingScreenSettings();
+
+public:
+	
+	// The widget to load for the loading screen.
+	UPROPERTY(config, EditAnywhere, Category=Display, meta=(MetaClass="/Script/UMG.UserWidget"))
+	FSoftClassPath LoadingScreenWidget;
+
+	// The z-order of the loading screen widget in the viewport stack
+	UPROPERTY(config, EditAnywhere, Category=Display)
+	int32 LoadingScreenZOrder = 10000;
+
+	// How long to hold the loading screen up after other loading finishes (in seconds) to
+	// try to give texture streaming a chance to avoid blurriness
+	//
+	// Note: This is not normally applied in the editor for iteration time, but can be 
+	// enabled via HoldLoadingScreenAdditionalSecsEvenInEditor
+ 	UPROPERTY(config, EditAnywhere, Category=Configuration, meta=(ForceUnits=s, ConsoleVariable="CommonLoadingScreen.HoldLoadingScreenAdditionalSecs"))
+	float HoldLoadingScreenAdditionalSecs = 2.0f;
+
+	// The interval in seconds beyond which the loading screen is considered permanently hung (if non-zero).
+ 	UPROPERTY(config, EditAnywhere, Category=Configuration, meta=(ForceUnits=s))
+	float LoadingScreenHeartbeatHangDuration = 0.0f;
+
+	// The interval in seconds between each log of what is keeping a loading screen up (if non-zero).
+ 	UPROPERTY(config, EditAnywhere, Category=Configuration, meta=(ForceUnits=s))
+	float LogLoadingScreenHeartbeatInterval = 5.0f;
+
+	// When true, the reason the loading screen is shown or hidden will be printed to the log every frame.
+	UPROPERTY(Transient, EditAnywhere, Category=Debugging, meta=(ConsoleVariable="CommonLoadingScreen.LogLoadingScreenReasonEveryFrame"))
+	bool LogLoadingScreenReasonEveryFrame = 0;
+
+	// Force the loading screen to be displayed (useful for debugging)
+	UPROPERTY(Transient, EditAnywhere, Category=Debugging, meta=(ConsoleVariable="CommonLoadingScreen.AlwaysShow"))
+	bool ForceLoadingScreenVisible = false;
+
+	// Should we apply the additional HoldLoadingScreenAdditionalSecs delay even in the editor
+	// (useful when iterating on loading screens)
+	UPROPERTY(Transient, EditAnywhere, Category=Debugging)
+	bool HoldLoadingScreenAdditionalSecsEvenInEditor = false;
+
+	// Should we apply the additional HoldLoadingScreenAdditionalSecs delay even in the editor
+	// (useful when iterating on loading screens)
+	UPROPERTY(config, EditAnywhere, Category=Configuration)
+	bool ForceTickLoadingScreenEvenInEditor = true;
+};
+
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/LoadingScreenManager.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/LoadingScreenManager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..425ca965111861dc81d70bd7a8620943a1e80dfa
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Private/LoadingScreenManager.cpp
@@ -0,0 +1,647 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "LoadingScreenManager.h"
+
+#include "HAL/ThreadHeartBeat.h"
+
+#include "Engine/GameInstance.h"
+#include "Engine/GameViewportClient.h"
+#include "Engine/Engine.h"
+#include "GameFramework/GameStateBase.h"
+#include "GameFramework/WorldSettings.h"
+#include "Misc/CommandLine.h"
+#include "Misc/ConfigCacheIni.h"
+
+#include "LoadingProcessInterface.h"
+
+#include "Framework/Application/IInputProcessor.h"
+#include "Framework/Application/SlateApplication.h"
+
+#include "PreLoadScreen.h"
+#include "PreLoadScreenManager.h"
+
+#include "ShaderPipelineCache.h"
+#include "CommonLoadingScreenSettings.h"
+
+//@TODO: Used as the placeholder widget in error cases, should probably create a wrapper that at least centers it/etc...
+#include "Widgets/Images/SThrobber.h"
+#include "Blueprint/UserWidget.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(LoadingScreenManager)
+
+DECLARE_LOG_CATEGORY_EXTERN(LogLoadingScreen, Log, All);
+DEFINE_LOG_CATEGORY(LogLoadingScreen);
+
+//@TODO: Why can GetLocalPlayers() have nullptr entries?  Can it really?
+//@TODO: Test with PIE mode set to simulate and decide how much (if any) loading screen action should occur
+//@TODO: Allow other things implementing ILoadingProcessInterface besides GameState/PlayerController (and owned components) to register as interested parties
+//@TODO: ChangeMusicSettings (either here or using the LoadingScreenVisibilityChanged delegate)
+//@TODO: Studio analytics (FireEvent_PIEFinishedLoading / tracking PIE startup time for regressions, either here or using the LoadingScreenVisibilityChanged delegate)
+
+// Profiling category for loading screens
+CSV_DEFINE_CATEGORY(LoadingScreen, true);
+
+//////////////////////////////////////////////////////////////////////
+
+bool ILoadingProcessInterface::ShouldShowLoadingScreen(UObject* TestObject, FString& OutReason)
+{
+	if (TestObject != nullptr)
+	{
+		if (ILoadingProcessInterface* LoadObserver = Cast<ILoadingProcessInterface>(TestObject))
+		{
+			FString ObserverReason;
+			if (LoadObserver->ShouldShowLoadingScreen(/*out*/ ObserverReason))
+			{
+				if (ensureMsgf(!ObserverReason.IsEmpty(), TEXT("%s failed to set a reason why it wants to show the loading screen"), *GetPathNameSafe(TestObject)))
+				{
+					OutReason = ObserverReason;
+				}
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+namespace LoadingScreenCVars
+{
+	// CVars
+	static float HoldLoadingScreenAdditionalSecs = 2.0f;
+	static FAutoConsoleVariableRef CVarHoldLoadingScreenUpAtLeastThisLongInSecs(
+		TEXT("CommonLoadingScreen.HoldLoadingScreenAdditionalSecs"),
+		HoldLoadingScreenAdditionalSecs,
+		TEXT("How long to hold the loading screen up after other loading finishes (in seconds) to try to give texture streaming a chance to avoid blurriness"),
+		ECVF_Default | ECVF_Preview);
+
+	static bool LogLoadingScreenReasonEveryFrame = false;
+	static FAutoConsoleVariableRef CVarLogLoadingScreenReasonEveryFrame(
+		TEXT("CommonLoadingScreen.LogLoadingScreenReasonEveryFrame"),
+		LogLoadingScreenReasonEveryFrame,
+		TEXT("When true, the reason the loading screen is shown or hidden will be printed to the log every frame."),
+		ECVF_Default);
+
+	static bool ForceLoadingScreenVisible = false;
+	static FAutoConsoleVariableRef CVarForceLoadingScreenVisible(
+		TEXT("CommonLoadingScreen.AlwaysShow"),
+		ForceLoadingScreenVisible,
+		TEXT("Force the loading screen to show."),
+		ECVF_Default);
+}
+
+//////////////////////////////////////////////////////////////////////
+// FLoadingScreenInputPreProcessor
+
+// Input processor to throw in when loading screen is shown
+// This will capture any inputs, so active menus under the loading screen will not interact
+class FLoadingScreenInputPreProcessor : public IInputProcessor
+{
+public:
+	FLoadingScreenInputPreProcessor() { }
+	virtual ~FLoadingScreenInputPreProcessor() { }
+
+	bool CanEatInput() const
+	{
+		return !GIsEditor;
+	}
+
+	//~IInputProcess interface
+	virtual void Tick(const float DeltaTime, FSlateApplication& SlateApp, TSharedRef<ICursor> Cursor) override { }
+
+	virtual bool HandleKeyDownEvent(FSlateApplication& SlateApp, const FKeyEvent& InKeyEvent) override { return CanEatInput(); }
+	virtual bool HandleKeyUpEvent(FSlateApplication& SlateApp, const FKeyEvent& InKeyEvent) override { return CanEatInput(); }
+	virtual bool HandleAnalogInputEvent(FSlateApplication& SlateApp, const FAnalogInputEvent& InAnalogInputEvent) override { return CanEatInput(); }
+	virtual bool HandleMouseMoveEvent(FSlateApplication& SlateApp, const FPointerEvent& MouseEvent) override { return CanEatInput(); }
+	virtual bool HandleMouseButtonDownEvent(FSlateApplication& SlateApp, const FPointerEvent& MouseEvent) override { return CanEatInput(); }
+	virtual bool HandleMouseButtonUpEvent(FSlateApplication& SlateApp, const FPointerEvent& MouseEvent) override { return CanEatInput(); }
+	virtual bool HandleMouseButtonDoubleClickEvent(FSlateApplication& SlateApp, const FPointerEvent& MouseEvent) override { return CanEatInput(); }
+	virtual bool HandleMouseWheelOrGestureEvent(FSlateApplication& SlateApp, const FPointerEvent& InWheelEvent, const FPointerEvent* InGestureEvent) override { return CanEatInput(); }
+	virtual bool HandleMotionDetectedEvent(FSlateApplication& SlateApp, const FMotionEvent& MotionEvent) override { return CanEatInput(); }
+	//~End of IInputProcess interface
+};
+
+//////////////////////////////////////////////////////////////////////
+// ULoadingScreenManager
+
+void ULoadingScreenManager::Initialize(FSubsystemCollectionBase& Collection)
+{
+	FCoreUObjectDelegates::PreLoadMapWithContext.AddUObject(this, &ThisClass::HandlePreLoadMap);
+	FCoreUObjectDelegates::PostLoadMapWithWorld.AddUObject(this, &ThisClass::HandlePostLoadMap);
+
+	const UGameInstance* LocalGameInstance = GetGameInstance();
+	check(LocalGameInstance);
+}
+
+void ULoadingScreenManager::Deinitialize()
+{
+	StopBlockingInput();
+
+	RemoveWidgetFromViewport();
+
+	FCoreUObjectDelegates::PreLoadMap.RemoveAll(this);
+	FCoreUObjectDelegates::PostLoadMapWithWorld.RemoveAll(this);
+
+	// We are done, so do not attempt to tick us again
+	SetTickableTickType(ETickableTickType::Never);
+}
+
+bool ULoadingScreenManager::ShouldCreateSubsystem(UObject* Outer) const
+{
+	// Only clients have loading screens
+	const UGameInstance* GameInstance = CastChecked<UGameInstance>(Outer);
+	const bool bIsServerWorld = GameInstance->IsDedicatedServerInstance();	
+	return !bIsServerWorld;
+}
+
+void ULoadingScreenManager::Tick(float DeltaTime)
+{
+	UpdateLoadingScreen();
+
+	TimeUntilNextLogHeartbeatSeconds = FMath::Max(TimeUntilNextLogHeartbeatSeconds - DeltaTime, 0.0);
+}
+
+ETickableTickType ULoadingScreenManager::GetTickableTickType() const
+{
+	if (IsTemplate())
+	{
+		return ETickableTickType::Never;
+	}
+	return ETickableTickType::Conditional;
+}
+
+bool ULoadingScreenManager::IsTickable() const
+{
+	// Don't tick if we don't have a game viewport client, this catches cases that ShouldCreateSubsystem does not
+	UGameInstance* GameInstance = GetGameInstance();
+	return (GameInstance && GameInstance->GetGameViewportClient());
+}
+
+TStatId ULoadingScreenManager::GetStatId() const
+{
+	RETURN_QUICK_DECLARE_CYCLE_STAT(ULoadingScreenManager, STATGROUP_Tickables);
+}
+
+UWorld* ULoadingScreenManager::GetTickableGameObjectWorld() const
+{
+	return GetGameInstance()->GetWorld();
+}
+
+void ULoadingScreenManager::RegisterLoadingProcessor(TScriptInterface<ILoadingProcessInterface> Interface)
+{
+	ExternalLoadingProcessors.Add(Interface.GetObject());
+}
+
+void ULoadingScreenManager::UnregisterLoadingProcessor(TScriptInterface<ILoadingProcessInterface> Interface)
+{
+	ExternalLoadingProcessors.Remove(Interface.GetObject());
+}
+
+void ULoadingScreenManager::HandlePreLoadMap(const FWorldContext& WorldContext, const FString& MapName)
+{
+	if (WorldContext.OwningGameInstance == GetGameInstance())
+	{
+		bCurrentlyInLoadMap = true;
+
+		// Update the loading screen immediately if the engine is initialized
+		if (GEngine->IsInitialized())
+		{
+			UpdateLoadingScreen();
+		}
+	}
+}
+
+void ULoadingScreenManager::HandlePostLoadMap(UWorld* World)
+{
+	if ((World != nullptr) && (World->GetGameInstance() == GetGameInstance()))
+	{
+		bCurrentlyInLoadMap = false;
+	}
+}
+
+void ULoadingScreenManager::UpdateLoadingScreen()
+{
+	bool bLogLoadingScreenStatus = LoadingScreenCVars::LogLoadingScreenReasonEveryFrame;
+
+	if (ShouldShowLoadingScreen())
+	{
+		const UCommonLoadingScreenSettings* Settings = GetDefault<UCommonLoadingScreenSettings>();
+		
+		// If we don't make it to the specified checkpoint in the given time will trigger the hang detector so we can better determine where progress stalled.
+ 		FThreadHeartBeat::Get().MonitorCheckpointStart(GetFName(), Settings->LoadingScreenHeartbeatHangDuration);
+
+		ShowLoadingScreen();
+
+ 		if ((Settings->LogLoadingScreenHeartbeatInterval > 0.0f) && (TimeUntilNextLogHeartbeatSeconds <= 0.0))
+ 		{
+			bLogLoadingScreenStatus = true;
+ 			TimeUntilNextLogHeartbeatSeconds = Settings->LogLoadingScreenHeartbeatInterval;
+ 		}
+	}
+	else
+	{
+		HideLoadingScreen();
+ 
+ 		FThreadHeartBeat::Get().MonitorCheckpointEnd(GetFName());
+	}
+
+	if (bLogLoadingScreenStatus)
+	{
+		UE_LOG(LogLoadingScreen, Log, TEXT("Loading screen showing: %d. Reason: %s"), bCurrentlyShowingLoadingScreen ? 1 : 0, *DebugReasonForShowingOrHidingLoadingScreen);
+	}
+}
+
+bool ULoadingScreenManager::CheckForAnyNeedToShowLoadingScreen()
+{
+	// Start out with 'unknown' reason in case someone forgets to put a reason when changing this in the future.
+	DebugReasonForShowingOrHidingLoadingScreen = TEXT("Reason for Showing/Hiding LoadingScreen is unknown!");
+
+	const UGameInstance* LocalGameInstance = GetGameInstance();
+
+	if (LoadingScreenCVars::ForceLoadingScreenVisible)
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("CommonLoadingScreen.AlwaysShow is true"));
+		return true;
+	}
+
+	const FWorldContext* Context = LocalGameInstance->GetWorldContext();
+	if (Context == nullptr)
+	{
+		// We don't have a world context right now... better show a loading screen
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("The game instance has a null WorldContext"));
+		return true;
+	}
+
+	UWorld* World = Context->World();
+	if (World == nullptr)
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("We have no world (FWorldContext's World() is null)"));
+		return true;
+	}
+
+	AGameStateBase* GameState = World->GetGameState<AGameStateBase>();
+	if (GameState == nullptr)
+	{
+		// The game state has not yet replicated.
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("GameState hasn't yet replicated (it's null)"));
+		return true;
+	}
+
+	if (bCurrentlyInLoadMap)
+	{
+		// Show a loading screen if we are in LoadMap
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("bCurrentlyInLoadMap is true"));
+		return true;
+	}
+
+	if (!Context->TravelURL.IsEmpty())
+	{
+		// Show a loading screen when pending travel
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("We have pending travel (the TravelURL is not empty)"));
+		return true;
+	}
+
+	if (Context->PendingNetGame != nullptr)
+	{
+		// Connecting to another server
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("We are connecting to another server (PendingNetGame != nullptr)"));
+		return true;
+	}
+
+	if (!World->HasBegunPlay())
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("World hasn't begun play"));
+		return true;
+	}
+
+	if (World->IsInSeamlessTravel())
+	{
+		// Show a loading screen during seamless travel
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("We are in seamless travel"));
+		return true;
+	}
+
+	// Ask the game state if it needs a loading screen	
+	if (ILoadingProcessInterface::ShouldShowLoadingScreen(GameState, /*out*/ DebugReasonForShowingOrHidingLoadingScreen))
+	{
+		return true;
+	}
+
+	// Ask any game state components if they need a loading screen
+	for (UActorComponent* TestComponent : GameState->GetComponents())
+	{
+		if (ILoadingProcessInterface::ShouldShowLoadingScreen(TestComponent, /*out*/ DebugReasonForShowingOrHidingLoadingScreen))
+		{
+			return true;
+		}
+	}
+
+	// Ask any of the external loading processors that may have been registered.  These might be actors or components
+	// that were registered by game code to tell us to keep the loading screen up while perhaps something finishes
+	// streaming in.
+	for (const TWeakInterfacePtr<ILoadingProcessInterface>& Processor : ExternalLoadingProcessors)
+	{
+		if (ILoadingProcessInterface::ShouldShowLoadingScreen(Processor.GetObject(), /*out*/ DebugReasonForShowingOrHidingLoadingScreen))
+		{
+			return true;
+		}
+	}
+
+	// Check each local player
+	bool bFoundAnyLocalPC = false;
+	bool bMissingAnyLocalPC = false;
+
+	for (ULocalPlayer* LP : LocalGameInstance->GetLocalPlayers())
+	{
+		if (LP != nullptr)
+		{
+			if (APlayerController* PC = LP->PlayerController)
+			{
+				bFoundAnyLocalPC = true;
+
+				// Ask the PC itself if it needs a loading screen
+				if (ILoadingProcessInterface::ShouldShowLoadingScreen(PC, /*out*/ DebugReasonForShowingOrHidingLoadingScreen))
+				{
+					return true;
+				}
+
+				// Ask any PC components if they need a loading screen
+				for (UActorComponent* TestComponent : PC->GetComponents())
+				{
+					if (ILoadingProcessInterface::ShouldShowLoadingScreen(TestComponent, /*out*/ DebugReasonForShowingOrHidingLoadingScreen))
+					{
+						return true;
+					}
+				}
+			}
+			else
+			{
+				bMissingAnyLocalPC = true;
+			}
+		}
+	}
+
+	UGameViewportClient* GameViewportClient = LocalGameInstance->GetGameViewportClient();
+	const bool bIsInSplitscreen = GameViewportClient->GetCurrentSplitscreenConfiguration() != ESplitScreenType::None;
+
+	// In splitscreen we need all player controllers to be present
+	if (bIsInSplitscreen && bMissingAnyLocalPC)
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("At least one missing local player controller in splitscreen"));
+		return true;
+	}
+
+	// And in non-splitscreen we need at least one player controller to be present
+	if (!bIsInSplitscreen && !bFoundAnyLocalPC)
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("Need at least one local player controller"));
+		return true;
+	}
+
+	// Victory! The loading screen can go away now
+	DebugReasonForShowingOrHidingLoadingScreen = TEXT("(nothing wants to show it anymore)");
+	return false;
+}
+
+bool ULoadingScreenManager::ShouldShowLoadingScreen()
+{
+	const UCommonLoadingScreenSettings* Settings = GetDefault<UCommonLoadingScreenSettings>();
+
+	// Check debugging commands that force the state one way or another
+#if !UE_BUILD_SHIPPING
+	static bool bCmdLineNoLoadingScreen = FParse::Param(FCommandLine::Get(), TEXT("NoLoadingScreen"));
+	if (bCmdLineNoLoadingScreen)
+	{
+		DebugReasonForShowingOrHidingLoadingScreen = FString(TEXT("CommandLine has 'NoLoadingScreen'"));
+		return false;
+	}
+#endif
+
+	// Can't show a loading screen if there's no game viewport
+	UGameInstance* LocalGameInstance = GetGameInstance();
+	if (LocalGameInstance->GetGameViewportClient() == nullptr)
+	{
+		return false;
+	}
+
+	// Check for a need to show the loading screen
+	const bool bNeedToShowLoadingScreen = CheckForAnyNeedToShowLoadingScreen();
+
+	// Keep the loading screen up a bit longer if desired
+	bool bWantToForceShowLoadingScreen = false;
+	if (bNeedToShowLoadingScreen)
+	{
+		// Still need to show it
+		TimeLoadingScreenLastDismissed = -1.0;
+	}
+	else
+	{
+		// Don't *need* to show the screen anymore, but might still want to for a bit
+		const double CurrentTime = FPlatformTime::Seconds();
+		const bool bCanHoldLoadingScreen = (!GIsEditor || Settings->HoldLoadingScreenAdditionalSecsEvenInEditor);
+		const double HoldLoadingScreenAdditionalSecs = bCanHoldLoadingScreen ? LoadingScreenCVars::HoldLoadingScreenAdditionalSecs : 0.0;
+
+		if (TimeLoadingScreenLastDismissed < 0.0)
+		{
+			TimeLoadingScreenLastDismissed = CurrentTime;
+		}
+		const double TimeSinceScreenDismissed = CurrentTime - TimeLoadingScreenLastDismissed;
+
+		// hold for an extra X seconds, to cover up streaming
+		if ((HoldLoadingScreenAdditionalSecs > 0.0) && (TimeSinceScreenDismissed < HoldLoadingScreenAdditionalSecs))
+		{
+			// Make sure we're rendering the world at this point, so that textures will actually stream in
+			//@TODO: If bNeedToShowLoadingScreen bounces back true during this window, we won't turn this off again...
+			UGameViewportClient* GameViewportClient = GetGameInstance()->GetGameViewportClient();
+			GameViewportClient->bDisableWorldRendering = false;
+
+			DebugReasonForShowingOrHidingLoadingScreen = FString::Printf(TEXT("Keeping loading screen up for an additional %.2f seconds to allow texture streaming"), HoldLoadingScreenAdditionalSecs);
+			bWantToForceShowLoadingScreen = true;
+		}
+	}
+
+	return bNeedToShowLoadingScreen || bWantToForceShowLoadingScreen;
+}
+
+bool ULoadingScreenManager::IsShowingInitialLoadingScreen() const
+{
+	FPreLoadScreenManager* PreLoadScreenManager = FPreLoadScreenManager::Get();
+	return (PreLoadScreenManager != nullptr) && PreLoadScreenManager->HasValidActivePreLoadScreen();
+}
+
+void ULoadingScreenManager::ShowLoadingScreen()
+{
+	if (bCurrentlyShowingLoadingScreen)
+	{
+		return;
+	}
+
+	// Unable to show loading screen if the engine is still loading with its loading screen.
+	if (FPreLoadScreenManager::Get() && FPreLoadScreenManager::Get()->HasActivePreLoadScreenType(EPreLoadScreenTypes::EngineLoadingScreen))
+	{
+		return;
+	}
+
+	TimeLoadingScreenShown = FPlatformTime::Seconds();
+
+	bCurrentlyShowingLoadingScreen = true;
+
+	CSV_EVENT(LoadingScreen, TEXT("Show"));
+
+	const UCommonLoadingScreenSettings* Settings = GetDefault<UCommonLoadingScreenSettings>();
+
+	if (IsShowingInitialLoadingScreen())
+	{
+		UE_LOG(LogLoadingScreen, Log, TEXT("Showing loading screen when 'IsShowingInitialLoadingScreen()' is true."));
+		UE_LOG(LogLoadingScreen, Log, TEXT("%s"), *DebugReasonForShowingOrHidingLoadingScreen);
+	}
+	else
+	{
+		UE_LOG(LogLoadingScreen, Log, TEXT("Showing loading screen when 'IsShowingInitialLoadingScreen()' is false."));
+		UE_LOG(LogLoadingScreen, Log, TEXT("%s"), *DebugReasonForShowingOrHidingLoadingScreen);
+
+		UGameInstance* LocalGameInstance = GetGameInstance();
+
+		// Eat input while the loading screen is displayed
+		StartBlockingInput();
+
+		LoadingScreenVisibilityChanged.Broadcast(/*bIsVisible=*/ true);
+
+		// Create the loading screen widget
+		TSubclassOf<UUserWidget> LoadingScreenWidgetClass = Settings->LoadingScreenWidget.TryLoadClass<UUserWidget>();
+		if (UUserWidget* UserWidget = UUserWidget::CreateWidgetInstance(*LocalGameInstance, LoadingScreenWidgetClass, NAME_None))
+		{
+			LoadingScreenWidget = UserWidget->TakeWidget();
+		}
+		else
+		{
+			UE_LOG(LogLoadingScreen, Error, TEXT("Failed to load the loading screen widget %s, falling back to placeholder."), *Settings->LoadingScreenWidget.ToString());
+			LoadingScreenWidget = SNew(SThrobber);
+		}
+
+		// Add to the viewport at a high ZOrder to make sure it is on top of most things
+		UGameViewportClient* GameViewportClient = LocalGameInstance->GetGameViewportClient();
+		GameViewportClient->AddViewportWidgetContent(LoadingScreenWidget.ToSharedRef(), Settings->LoadingScreenZOrder);
+
+		ChangePerformanceSettings(/*bEnableLoadingScreen=*/ true);
+
+		if (!GIsEditor || Settings->ForceTickLoadingScreenEvenInEditor)
+		{
+			// Tick Slate to make sure the loading screen is displayed immediately
+			FSlateApplication::Get().Tick();
+		}
+	}
+}
+
+void ULoadingScreenManager::HideLoadingScreen()
+{
+	if (!bCurrentlyShowingLoadingScreen)
+	{
+		return;
+	}
+
+	StopBlockingInput();
+
+	if (IsShowingInitialLoadingScreen())
+	{
+		UE_LOG(LogLoadingScreen, Log, TEXT("Hiding loading screen when 'IsShowingInitialLoadingScreen()' is true."));
+		UE_LOG(LogLoadingScreen, Log, TEXT("%s"), *DebugReasonForShowingOrHidingLoadingScreen);
+	}
+	else
+	{
+		UE_LOG(LogLoadingScreen, Log, TEXT("Hiding loading screen when 'IsShowingInitialLoadingScreen()' is false."));
+		UE_LOG(LogLoadingScreen, Log, TEXT("%s"), *DebugReasonForShowingOrHidingLoadingScreen);
+
+		UE_LOG(LogLoadingScreen, Log, TEXT("Garbage Collecting before dropping load screen"));
+		GEngine->ForceGarbageCollection(true);
+
+		RemoveWidgetFromViewport();
+	
+		ChangePerformanceSettings(/*bEnableLoadingScreen=*/ false);
+
+		// Let observers know that the loading screen is done
+		LoadingScreenVisibilityChanged.Broadcast(/*bIsVisible=*/ false);
+	}
+
+	CSV_EVENT(LoadingScreen, TEXT("Hide"));
+
+	const double LoadingScreenDuration = FPlatformTime::Seconds() - TimeLoadingScreenShown;
+	UE_LOG(LogLoadingScreen, Log, TEXT("LoadingScreen was visible for %.2fs"), LoadingScreenDuration);
+
+	bCurrentlyShowingLoadingScreen = false;
+}
+
+void ULoadingScreenManager::RemoveWidgetFromViewport()
+{
+	UGameInstance* LocalGameInstance = GetGameInstance();
+	if (LoadingScreenWidget.IsValid())
+	{
+		if (UGameViewportClient* GameViewportClient = LocalGameInstance->GetGameViewportClient())
+		{
+			GameViewportClient->RemoveViewportWidgetContent(LoadingScreenWidget.ToSharedRef());
+		}
+		LoadingScreenWidget.Reset();
+	}
+}
+
+void ULoadingScreenManager::StartBlockingInput()
+{
+	if (!InputPreProcessor.IsValid())
+	{
+		InputPreProcessor = MakeShareable<FLoadingScreenInputPreProcessor>(new FLoadingScreenInputPreProcessor());
+		FSlateApplication::Get().RegisterInputPreProcessor(InputPreProcessor, 0);
+	}
+}
+
+void ULoadingScreenManager::StopBlockingInput()
+{
+	if (InputPreProcessor.IsValid())
+	{
+		FSlateApplication::Get().UnregisterInputPreProcessor(InputPreProcessor);
+		InputPreProcessor.Reset();
+	}
+}
+
+void ULoadingScreenManager::ChangePerformanceSettings(bool bEnabingLoadingScreen)
+{
+	UGameInstance* LocalGameInstance = GetGameInstance();
+	UGameViewportClient* GameViewportClient = LocalGameInstance->GetGameViewportClient();
+
+	FShaderPipelineCache::SetBatchMode(bEnabingLoadingScreen ? FShaderPipelineCache::BatchMode::Fast : FShaderPipelineCache::BatchMode::Background);
+
+	// Don't bother drawing the 3D world while we're loading
+	GameViewportClient->bDisableWorldRendering = bEnabingLoadingScreen;
+
+	// Make sure to prioritize streaming in levels if the loading screen is up
+	if (UWorld* ViewportWorld = GameViewportClient->GetWorld())
+	{
+		if (AWorldSettings* WorldSettings = ViewportWorld->GetWorldSettings(false, false))
+		{
+			WorldSettings->bHighPriorityLoadingLocal = bEnabingLoadingScreen;
+		}
+	}
+
+	if (bEnabingLoadingScreen)
+	{
+		// Set a new hang detector timeout multiplier when the loading screen is visible.
+		double HangDurationMultiplier;
+		if (!GConfig || !GConfig->GetDouble(TEXT("Core.System"), TEXT("LoadingScreenHangDurationMultiplier"), /*out*/ HangDurationMultiplier, GEngineIni))
+		{
+			HangDurationMultiplier = 1.0;
+		}
+		FThreadHeartBeat::Get().SetDurationMultiplier(HangDurationMultiplier);
+
+		// Do not report hitches while the loading screen is up
+		FGameThreadHitchHeartBeat::Get().SuspendHeartBeat();
+	}
+	else
+	{
+		// Restore the hang detector timeout when we hide the loading screen
+		FThreadHeartBeat::Get().SetDurationMultiplier(1.0);
+
+		// Resume reporting hitches now that the loading screen is down
+		FGameThreadHitchHeartBeat::Get().ResumeHeartBeat();
+	}
+}
+
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessInterface.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessInterface.h
new file mode 100644
index 0000000000000000000000000000000000000000..136af393e1aefa77ea590fec60319abdbcb637fa
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessInterface.h
@@ -0,0 +1,34 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Interface.h"
+
+#include "LoadingProcessInterface.generated.h"
+
+#define UE_API COMMONLOADINGSCREEN_API
+
+/** Interface for things that might cause loading to happen which requires a loading screen to be displayed */
+UINTERFACE(MinimalAPI, BlueprintType)
+class ULoadingProcessInterface : public UInterface
+{
+	GENERATED_BODY()
+};
+
+class ILoadingProcessInterface
+{
+	GENERATED_BODY()
+
+public:
+	// Checks to see if this object implements the interface, and if so asks whether or not we should
+	// be currently showing a loading screen
+	static UE_API bool ShouldShowLoadingScreen(UObject* TestObject, FString& OutReason);
+
+	virtual bool ShouldShowLoadingScreen(FString& OutReason) const
+	{
+		return false;
+	}
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..eff216138ae27a399a21ebdcdc47d84fcb34f6c3
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.cpp
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "LoadingProcessTask.h"
+
+#include "Engine/Engine.h"
+#include "Engine/GameInstance.h"
+#include "Engine/World.h"
+#include "LoadingScreenManager.h"
+#include "UObject/ScriptInterface.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(LoadingProcessTask)
+
+/*static*/ ULoadingProcessTask* ULoadingProcessTask::CreateLoadingScreenProcessTask(UObject* WorldContextObject, const FString& ShowLoadingScreenReason)
+{
+	UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
+	UGameInstance* GameInstance = World ? World->GetGameInstance() : nullptr;
+	ULoadingScreenManager* LoadingScreenManager = GameInstance ? GameInstance->GetSubsystem<ULoadingScreenManager>() : nullptr;
+
+	if (LoadingScreenManager)
+	{
+		ULoadingProcessTask* NewLoadingTask = NewObject<ULoadingProcessTask>(LoadingScreenManager);
+		NewLoadingTask->SetShowLoadingScreenReason(ShowLoadingScreenReason);
+
+		LoadingScreenManager->RegisterLoadingProcessor(NewLoadingTask);
+		
+		return NewLoadingTask;
+	}
+
+	return nullptr;
+}
+
+void ULoadingProcessTask::Unregister()
+{
+	ULoadingScreenManager* LoadingScreenManager = Cast<ULoadingScreenManager>(GetOuter());
+	LoadingScreenManager->UnregisterLoadingProcessor(this);
+}
+
+void ULoadingProcessTask::SetShowLoadingScreenReason(const FString& InReason)
+{
+	Reason = InReason;
+}
+
+bool ULoadingProcessTask::ShouldShowLoadingScreen(FString& OutReason) const
+{
+	OutReason = Reason;
+	return true;
+}
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.h
new file mode 100644
index 0000000000000000000000000000000000000000..52ba5f389f09ad2a9d27ef7e4b219e83e3884ffb
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingProcessTask.h
@@ -0,0 +1,37 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "LoadingProcessInterface.h"
+#include "UObject/Object.h"
+
+#include "LoadingProcessTask.generated.h"
+
+#define UE_API COMMONLOADINGSCREEN_API
+
+struct FFrame;
+
+UCLASS(MinimalAPI, BlueprintType)
+class ULoadingProcessTask : public UObject, public ILoadingProcessInterface
+{
+	GENERATED_BODY()
+	
+public:
+	UFUNCTION(BlueprintCallable, meta=(WorldContext = "WorldContextObject"))
+	static UE_API ULoadingProcessTask* CreateLoadingScreenProcessTask(UObject* WorldContextObject, const FString& ShowLoadingScreenReason);
+
+public:
+	ULoadingProcessTask() { }
+
+	UFUNCTION(BlueprintCallable)
+	UE_API void Unregister();
+
+	UFUNCTION(BlueprintCallable)
+	UE_API void SetShowLoadingScreenReason(const FString& InReason);
+
+	UE_API virtual bool ShouldShowLoadingScreen(FString& OutReason) const override;
+	
+	FString Reason;
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingScreenManager.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingScreenManager.h
new file mode 100644
index 0000000000000000000000000000000000000000..bcc9a0328fe2186042e636d74f172814affb67a6
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonLoadingScreen/Public/LoadingScreenManager.h
@@ -0,0 +1,131 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Subsystems/GameInstanceSubsystem.h"
+#include "Tickable.h"
+#include "UObject/WeakInterfacePtr.h"
+
+#include "LoadingScreenManager.generated.h"
+
+#define UE_API COMMONLOADINGSCREEN_API
+
+template <typename InterfaceType> class TScriptInterface;
+
+class FSubsystemCollectionBase;
+class IInputProcessor;
+class ILoadingProcessInterface;
+class SWidget;
+class UObject;
+class UWorld;
+struct FFrame;
+struct FWorldContext;
+
+/**
+ * Handles showing/hiding the loading screen
+ */
+UCLASS(MinimalAPI)
+class ULoadingScreenManager : public UGameInstanceSubsystem, public FTickableGameObject
+{
+	GENERATED_BODY()
+
+public:
+	//~USubsystem interface
+	UE_API virtual void Initialize(FSubsystemCollectionBase& Collection) override;
+	UE_API virtual void Deinitialize() override;
+	UE_API virtual bool ShouldCreateSubsystem(UObject* Outer) const override;
+	//~End of USubsystem interface
+
+	//~FTickableObjectBase interface
+	UE_API virtual void Tick(float DeltaTime) override;
+	UE_API virtual ETickableTickType GetTickableTickType() const override;
+	UE_API virtual bool IsTickable() const override;
+	UE_API virtual TStatId GetStatId() const override;
+	UE_API virtual UWorld* GetTickableGameObjectWorld() const override;
+	//~End of FTickableObjectBase interface
+
+	UFUNCTION(BlueprintCallable, Category=LoadingScreen)
+	FString GetDebugReasonForShowingOrHidingLoadingScreen() const
+	{
+		return DebugReasonForShowingOrHidingLoadingScreen;
+	}
+
+	/** Returns True when the loading screen is currently being shown */
+	bool GetLoadingScreenDisplayStatus() const
+	{
+		return bCurrentlyShowingLoadingScreen;
+	}
+
+	/** Called when the loading screen visibility changes  */
+	DECLARE_MULTICAST_DELEGATE_OneParam(FOnLoadingScreenVisibilityChangedDelegate, bool);
+	FORCEINLINE FOnLoadingScreenVisibilityChangedDelegate& OnLoadingScreenVisibilityChangedDelegate() { return LoadingScreenVisibilityChanged; }
+
+	UE_API void RegisterLoadingProcessor(TScriptInterface<ILoadingProcessInterface> Interface);
+	UE_API void UnregisterLoadingProcessor(TScriptInterface<ILoadingProcessInterface> Interface);
+	
+private:
+	UE_API void HandlePreLoadMap(const FWorldContext& WorldContext, const FString& MapName);
+	UE_API void HandlePostLoadMap(UWorld* World);
+
+	/** Determines if we should show or hide the loading screen. Called every frame. */
+	UE_API void UpdateLoadingScreen();
+
+	/** Returns true if we need to be showing the loading screen. */
+	UE_API bool CheckForAnyNeedToShowLoadingScreen();
+
+	/** Returns true if we want to be showing the loading screen (if we need to or are artificially forcing it on for other reasons). */
+	UE_API bool ShouldShowLoadingScreen();
+
+	/** Returns true if we are in the initial loading flow before this screen should be used */
+	UE_API bool IsShowingInitialLoadingScreen() const;
+
+	/** Shows the loading screen. Sets up the loading screen widget on the viewport */
+	UE_API void ShowLoadingScreen();
+
+	/** Hides the loading screen. The loading screen widget will be destroyed */
+	UE_API void HideLoadingScreen();
+
+	/** Removes the widget from the viewport */
+	UE_API void RemoveWidgetFromViewport();
+
+	/** Prevents input from being used in-game while the loading screen is visible */
+	UE_API void StartBlockingInput();
+
+	/** Resumes in-game input, if blocking */
+	UE_API void StopBlockingInput();
+
+	UE_API void ChangePerformanceSettings(bool bEnabingLoadingScreen);
+
+private:
+	/** Delegate broadcast when the loading screen visibility changes */
+	FOnLoadingScreenVisibilityChangedDelegate LoadingScreenVisibilityChanged;
+
+	/** A reference to the loading screen widget we are displaying (if any) */
+	TSharedPtr<SWidget> LoadingScreenWidget;
+
+	/** Input processor to eat all input while the loading screen is shown */
+	TSharedPtr<IInputProcessor> InputPreProcessor;
+
+	/** External loading processors, components maybe actors that delay the loading. */
+	TArray<TWeakInterfacePtr<ILoadingProcessInterface>> ExternalLoadingProcessors;
+
+	/** The reason why the loading screen is up (or not) */
+	FString DebugReasonForShowingOrHidingLoadingScreen;
+
+	/** The time when we started showing the loading screen */
+	double TimeLoadingScreenShown = 0.0;
+
+	/** The time the loading screen most recently wanted to be dismissed (might still be up due to a min display duration requirement) **/
+	double TimeLoadingScreenLastDismissed = -1.0;
+
+	/** The time until the next log for why the loading screen is still up */
+	double TimeUntilNextLogHeartbeatSeconds = 0.0;
+
+	/** True when we are between PreLoadMap and PostLoadMap */
+	bool bCurrentlyInLoadMap = false;
+
+	/** True when the loading screen is currently being shown */
+	bool bCurrentlyShowingLoadingScreen = false;
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/CommonStartupLoadingScreen.Build.cs b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/CommonStartupLoadingScreen.Build.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1bed2617e753f98abdb18710e8060013daffefb6
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/CommonStartupLoadingScreen.Build.cs
@@ -0,0 +1,55 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class CommonStartupLoadingScreen : ModuleRules
+{
+	public CommonStartupLoadingScreen(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+				
+		
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+			
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				// ... add other public dependencies that you statically link with here ...
+			}
+			);
+			
+		
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				"MoviePlayer",
+				"PreLoadScreen",
+				"DeveloperSettings"
+			}
+			);
+		
+		
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4faaa3802093387fb8b8ac02f601e4214381886d
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.cpp
@@ -0,0 +1,18 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonPreLoadScreen.h"
+
+#include "Misc/App.h"
+#include "SCommonPreLoadingScreenWidget.h"
+
+#define LOCTEXT_NAMESPACE "CommonPreLoadingScreen"
+
+void FCommonPreLoadScreen::Init()
+{
+	if (!GIsEditor && FApp::CanEverRender())
+	{
+		EngineLoadingWidget = SNew(SCommonPreLoadingScreenWidget);
+	}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.h
new file mode 100644
index 0000000000000000000000000000000000000000..f5aa26666df6cadb987e8ed85c0eeba00d4e8720
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonPreLoadScreen.h
@@ -0,0 +1,20 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "PreLoadScreenBase.h"
+
+class SWidget;
+
+class FCommonPreLoadScreen : public FPreLoadScreenBase
+{
+public:
+	
+    /*** IPreLoadScreen Implementation ***/
+	virtual void Init() override;
+    virtual EPreLoadScreenTypes GetPreLoadScreenType() const override { return EPreLoadScreenTypes::EngineLoadingScreen; }
+    virtual TSharedPtr<SWidget> GetWidget() override { return EngineLoadingWidget; }
+private:
+
+    TSharedPtr<SWidget> EngineLoadingWidget;
+};
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonStartupLoadingScreen.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonStartupLoadingScreen.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..873510954078ea52308659f762e9a02753449833
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/CommonStartupLoadingScreen.cpp
@@ -0,0 +1,62 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonPreLoadScreen.h"
+#include "Misc/App.h"
+#include "Modules/ModuleManager.h"
+#include "PreLoadScreenManager.h"
+
+#define LOCTEXT_NAMESPACE "FCommonLoadingScreenModule"
+
+class FCommonStartupLoadingScreenModule : public IModuleInterface
+{
+public:
+
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+	bool IsGameModule() const override;
+
+private:
+	void OnPreLoadScreenManagerCleanUp();
+
+	TSharedPtr<FCommonPreLoadScreen> PreLoadingScreen;
+};
+
+
+void FCommonStartupLoadingScreenModule::StartupModule()
+{
+	// No need to load these assets on dedicated servers.
+	// Still want to load them in commandlets so cook catches them
+	if (!IsRunningDedicatedServer())
+	{
+		PreLoadingScreen = MakeShared<FCommonPreLoadScreen>();
+		PreLoadingScreen->Init();
+
+		if (!GIsEditor && FApp::CanEverRender() && FPreLoadScreenManager::Get())
+		{
+			FPreLoadScreenManager::Get()->RegisterPreLoadScreen(PreLoadingScreen);
+			FPreLoadScreenManager::Get()->OnPreLoadScreenManagerCleanUp.AddRaw(this, &FCommonStartupLoadingScreenModule::OnPreLoadScreenManagerCleanUp);
+		}
+	}
+}
+
+void FCommonStartupLoadingScreenModule::OnPreLoadScreenManagerCleanUp()
+{
+	//Once the PreLoadScreenManager is cleaning up, we can get rid of all our resources too
+	PreLoadingScreen.Reset();
+	ShutdownModule();
+}
+
+void FCommonStartupLoadingScreenModule::ShutdownModule()
+{
+
+}
+
+bool FCommonStartupLoadingScreenModule::IsGameModule() const
+{
+	return true;
+}
+
+#undef LOCTEXT_NAMESPACE
+	
+IMPLEMENT_MODULE(FCommonStartupLoadingScreenModule, CommonStartupLoadingScreen)
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.cpp b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..44747cd6dcbd3a03f77ac6124a39c779022f88bb
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.cpp
@@ -0,0 +1,32 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "SCommonPreLoadingScreenWidget.h"
+
+#include "Widgets/Layout/SBorder.h"
+
+class FReferenceCollector;
+
+#define LOCTEXT_NAMESPACE "SCommonPreLoadingScreenWidget"
+
+void SCommonPreLoadingScreenWidget::Construct(const FArguments& InArgs)
+{
+	ChildSlot
+	[
+		SNew(SBorder)
+		.BorderImage(FCoreStyle::Get().GetBrush("WhiteBrush"))
+		.BorderBackgroundColor(FLinearColor::Black)
+		.Padding(0)
+	];
+}
+
+void SCommonPreLoadingScreenWidget::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	//WidgetAssets.AddReferencedObjects(Collector);
+}
+
+FString SCommonPreLoadingScreenWidget::GetReferencerName() const
+{
+	return TEXT("SCommonPreLoadingScreenWidget");
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.h b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.h
new file mode 100644
index 0000000000000000000000000000000000000000..42cf12748fbedee105a0b1ddcfc3a0ea74edd4f8
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonLoadingScreen/Source/CommonStartupLoadingScreen/Private/SCommonPreLoadingScreenWidget.h
@@ -0,0 +1,26 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/GCObject.h"
+#include "Widgets/Accessibility/SlateWidgetAccessibleTypes.h"
+#include "Widgets/SCompoundWidget.h"
+
+class FReferenceCollector;
+
+class SCommonPreLoadingScreenWidget : public SCompoundWidget, public FGCObject
+{
+public:
+	SLATE_BEGIN_ARGS(SCommonPreLoadingScreenWidget) {}
+    SLATE_END_ARGS()
+
+    void Construct(const FArguments& InArgs);
+
+	//~ Begin FGCObject interface
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+	virtual FString GetReferencerName() const override;
+	//~ End FGCObject interface
+
+private:
+
+};
diff --git a/LyraStarterGame/Plugins/CommonUser/Binaries/Win64/UnrealEditor.modules b/LyraStarterGame/Plugins/CommonUser/Binaries/Win64/UnrealEditor.modules
new file mode 100644
index 0000000000000000000000000000000000000000..bcbd0828d69fe1cfaca7934b515ae75a0a02acfa
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Binaries/Win64/UnrealEditor.modules
@@ -0,0 +1,7 @@
+{
+	"BuildId": "43139311",
+	"Modules": 
+	{
+		"CommonUser": "UnrealEditor-CommonUser.dll"
+	}
+}
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/CommonUser.Build.cs b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/CommonUser.Build.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7864b0787d2e3794f503b5eaa6f23c7f6962c000
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/CommonUser.Build.cs
@@ -0,0 +1,71 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class CommonUser : ModuleRules
+{
+	public CommonUser(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+
+		bool bUseOnlineSubsystemV1 = true;
+
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+				
+		
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+			
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreOnline",
+				"GameplayTags",
+				"OnlineSubsystemUtils",
+				// ... add other public dependencies that you statically link with here ...
+			}
+			);
+
+		if (bUseOnlineSubsystemV1)
+		{
+			PublicDependencyModuleNames.Add("OnlineSubsystem");
+		}
+		else
+		{
+			PublicDependencyModuleNames.Add("OnlineServicesInterface");
+		}
+
+		PublicDefinitions.Add("COMMONUSER_OSSV1=" + (bUseOnlineSubsystemV1 ? "1" : "0"));
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreOnline",
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				"ApplicationCore",
+				"InputCore",
+				// ... add private dependencies that you statically link with here ...	
+			}
+			);
+		
+		
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/AsyncAction_CommonUserInitialize.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/AsyncAction_CommonUserInitialize.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7946bb9349c3c8c02f02cdaa12ce90ebbeb5ed09
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/AsyncAction_CommonUserInitialize.cpp
@@ -0,0 +1,105 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "AsyncAction_CommonUserInitialize.h"
+
+#include "GenericPlatform/GenericPlatformInputDeviceMapper.h"
+#include "TimerManager.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(AsyncAction_CommonUserInitialize)
+
+UAsyncAction_CommonUserInitialize* UAsyncAction_CommonUserInitialize::InitializeForLocalPlay(UCommonUserSubsystem* Target, int32 LocalPlayerIndex, FInputDeviceId PrimaryInputDevice, bool bCanUseGuestLogin)
+{
+	if (!PrimaryInputDevice.IsValid())
+	{
+		// Set to default device
+		PrimaryInputDevice = IPlatformInputDeviceMapper::Get().GetDefaultInputDevice();
+	}
+
+	UAsyncAction_CommonUserInitialize* Action = NewObject<UAsyncAction_CommonUserInitialize>();
+
+	Action->RegisterWithGameInstance(Target);
+
+	if (Target && Action->IsRegistered())
+	{
+		Action->Subsystem = Target;
+		
+		Action->Params.RequestedPrivilege = ECommonUserPrivilege::CanPlay;
+		Action->Params.LocalPlayerIndex = LocalPlayerIndex;
+		Action->Params.PrimaryInputDevice = PrimaryInputDevice;
+		Action->Params.bCanUseGuestLogin = bCanUseGuestLogin;
+		Action->Params.bCanCreateNewLocalPlayer = true;
+	}
+	else
+	{
+		Action->SetReadyToDestroy();
+	}
+
+	return Action;
+}
+
+UAsyncAction_CommonUserInitialize* UAsyncAction_CommonUserInitialize::LoginForOnlinePlay(UCommonUserSubsystem* Target, int32 LocalPlayerIndex)
+{
+	UAsyncAction_CommonUserInitialize* Action = NewObject<UAsyncAction_CommonUserInitialize>();
+
+	Action->RegisterWithGameInstance(Target);
+
+	if (Target && Action->IsRegistered())
+	{
+		Action->Subsystem = Target;
+		
+		Action->Params.RequestedPrivilege = ECommonUserPrivilege::CanPlayOnline;
+		Action->Params.LocalPlayerIndex = LocalPlayerIndex;
+		Action->Params.bCanCreateNewLocalPlayer = false;
+	}
+	else
+	{
+		Action->SetReadyToDestroy();
+	}
+
+	return Action;
+}
+
+void UAsyncAction_CommonUserInitialize::HandleFailure()
+{
+	const UCommonUserInfo* UserInfo = nullptr;
+	if (Subsystem.IsValid())
+	{
+		UserInfo = Subsystem->GetUserInfoForLocalPlayerIndex(Params.LocalPlayerIndex);
+	}
+	HandleInitializationComplete(UserInfo, false, NSLOCTEXT("CommonUser", "LoginFailedEarly", "Unable to start login process"), Params.RequestedPrivilege, Params.OnlineContext);
+}
+
+void UAsyncAction_CommonUserInitialize::HandleInitializationComplete(const UCommonUserInfo* UserInfo, bool bSuccess, FText Error, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext OnlineContext)
+{
+	if (ShouldBroadcastDelegates())
+	{
+		OnInitializationComplete.Broadcast(UserInfo, bSuccess, Error, RequestedPrivilege, OnlineContext);
+	}
+
+	SetReadyToDestroy();
+}
+
+void UAsyncAction_CommonUserInitialize::Activate()
+{
+	if (Subsystem.IsValid())
+	{
+		Params.OnUserInitializeComplete.BindUFunction(this, GET_FUNCTION_NAME_CHECKED(UAsyncAction_CommonUserInitialize, HandleInitializationComplete));
+		bool bSuccess = Subsystem->TryToInitializeUser(Params);
+
+		if (!bSuccess)
+		{
+			// Call failure next frame
+			FTimerManager* TimerManager = GetTimerManager();
+			
+			if (TimerManager)
+			{
+				TimerManager->SetTimerForNextTick(FTimerDelegate::CreateUObject(this, &UAsyncAction_CommonUserInitialize::HandleFailure));
+			}
+		}
+	}
+	else
+	{
+		SetReadyToDestroy();
+	}	
+}
+
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonSessionSubsystem.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonSessionSubsystem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..895b70ddfa909a99cf43ec2a8ae3eb6e5561fa68
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonSessionSubsystem.cpp
@@ -0,0 +1,1771 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonSessionSubsystem.h"
+#include "AssetRegistry/AssetData.h"
+#include "CommonUserTypes.h"
+#include "Engine/AssetManager.h"
+#include "Engine/GameInstance.h"
+#include "Engine/LocalPlayer.h"
+#include "GameFramework/PlayerController.h"
+#include "Interfaces/OnlineSessionDelegates.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Online/OnlineSessionNames.h"
+#include "OnlineBeaconHost.h"
+#include "OnlineSessionSettings.h"
+#include "Engine/World.h"
+#include "Engine/Engine.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonSessionSubsystem)
+
+#if COMMONUSER_OSSV1
+#include "Engine/World.h"
+#include "OnlineSubsystemUtils.h"
+
+FName SETTING_ONLINESUBSYSTEM_VERSION(TEXT("OSSv1"));
+#else
+#include "Online/OnlineSessionNames.h"
+#include "Interfaces/OnlineSessionDelegates.h"
+#include "Online/OnlineServicesEngineUtils.h"
+
+FName SETTING_ONLINESUBSYSTEM_VERSION(TEXT("OSSv2"));
+using namespace UE::Online;
+#endif // COMMONUSER_OSSV1
+
+
+DECLARE_LOG_CATEGORY_EXTERN(LogCommonSession, Log, All);
+DEFINE_LOG_CATEGORY(LogCommonSession);
+
+#define LOCTEXT_NAMESPACE "CommonUser"
+
+//////////////////////////////////////////////////////////////////////
+//UCommonSession_SearchSessionRequest
+
+void UCommonSession_SearchSessionRequest::NotifySearchFinished(bool bSucceeded, const FText& ErrorMessage)
+{
+	OnSearchFinished.Broadcast(bSucceeded, ErrorMessage);
+	K2_OnSearchFinished.Broadcast(bSucceeded, ErrorMessage);
+}
+
+
+//////////////////////////////////////////////////////////////////////
+//UCommonSession_SearchResult
+
+#if COMMONUSER_OSSV1
+FString UCommonSession_SearchResult::GetDescription() const
+{
+	return Result.GetSessionIdStr();
+}
+
+void UCommonSession_SearchResult::GetStringSetting(FName Key, FString& Value, bool& bFoundValue) const
+{
+	bFoundValue = Result.Session.SessionSettings.Get<FString>(Key, /*out*/ Value);
+}
+
+void UCommonSession_SearchResult::GetIntSetting(FName Key, int32& Value, bool& bFoundValue) const
+{
+	bFoundValue = Result.Session.SessionSettings.Get<int32>(Key, /*out*/ Value);
+}
+
+int32 UCommonSession_SearchResult::GetNumOpenPrivateConnections() const
+{
+	return Result.Session.NumOpenPrivateConnections;
+}
+
+int32 UCommonSession_SearchResult::GetNumOpenPublicConnections() const
+{
+	return Result.Session.NumOpenPublicConnections;
+}
+
+int32 UCommonSession_SearchResult::GetMaxPublicConnections() const
+{
+	return Result.Session.SessionSettings.NumPublicConnections;
+}
+
+int32 UCommonSession_SearchResult::GetPingInMs() const
+{
+	return Result.PingInMs;
+}
+#else
+FString UCommonSession_SearchResult::GetDescription() const
+{
+	return ToLogString(Lobby->LobbyId);
+}
+
+void UCommonSession_SearchResult::GetStringSetting(FName Key, FString& Value, bool& bFoundValue) const
+{
+	if (const FSchemaVariant* VariantValue = Lobby->Attributes.Find(Key))
+	{
+		bFoundValue = true;
+		Value = VariantValue->GetString();
+	}
+	else
+	{
+		bFoundValue = false;
+	}
+}
+
+void UCommonSession_SearchResult::GetIntSetting(FName Key, int32& Value, bool& bFoundValue) const
+{
+	if (const FSchemaVariant* VariantValue = Lobby->Attributes.Find(Key))
+	{
+		bFoundValue = true;
+		Value = (int32)VariantValue->GetInt64();
+	}
+	else
+	{
+		bFoundValue = false;
+	}
+}
+
+int32 UCommonSession_SearchResult::GetNumOpenPrivateConnections() const
+{
+	// TODO:  Private connections
+	return 0;
+}
+
+int32 UCommonSession_SearchResult::GetNumOpenPublicConnections() const
+{
+	return Lobby->MaxMembers - Lobby->Members.Num();
+}
+
+int32 UCommonSession_SearchResult::GetMaxPublicConnections() const
+{
+	return Lobby->MaxMembers;
+}
+
+int32 UCommonSession_SearchResult::GetPingInMs() const
+{
+	// TODO:  Not a property of lobbies.  Need to implement with sessions.
+	return 0;
+}
+#endif //COMMONUSER_OSSV1
+
+
+class FCommonOnlineSearchSettingsBase : public FGCObject
+{
+public:
+	FCommonOnlineSearchSettingsBase(UCommonSession_SearchSessionRequest* InSearchRequest)
+	{
+		SearchRequest = InSearchRequest;
+	}
+
+	virtual ~FCommonOnlineSearchSettingsBase() {}
+
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override
+	{
+		Collector.AddReferencedObject(SearchRequest);
+	}
+
+	virtual FString GetReferencerName() const override
+	{
+		static const FString NameString = TEXT("FCommonOnlineSearchSettings");
+		return NameString;
+	}
+
+public:
+	TObjectPtr<UCommonSession_SearchSessionRequest> SearchRequest = nullptr;
+};
+
+#if COMMONUSER_OSSV1
+//////////////////////////////////////////////////////////////////////
+// FCommonSession_OnlineSessionSettings
+
+class FCommonSession_OnlineSessionSettings : public FOnlineSessionSettings
+{
+public:
+
+	FCommonSession_OnlineSessionSettings(bool bIsLAN = false, bool bIsPresence = false, int32 MaxNumPlayers = 4)
+	{
+		NumPublicConnections = MaxNumPlayers;
+		if (NumPublicConnections < 0)
+		{
+			NumPublicConnections = 0;
+		}
+		NumPrivateConnections = 0;
+		bIsLANMatch = bIsLAN;
+		bShouldAdvertise = true;
+		bAllowJoinInProgress = true;
+		bAllowInvites = true;
+		bUsesPresence = bIsPresence;
+		bAllowJoinViaPresence = true;
+		bAllowJoinViaPresenceFriendsOnly = false;
+	}
+
+	virtual ~FCommonSession_OnlineSessionSettings() {}
+};
+
+//////////////////////////////////////////////////////////////////////
+// FCommonOnlineSearchSettingsOSSv1
+
+class FCommonOnlineSearchSettingsOSSv1 : public FOnlineSessionSearch, public FCommonOnlineSearchSettingsBase
+{
+public:
+	FCommonOnlineSearchSettingsOSSv1(UCommonSession_SearchSessionRequest* InSearchRequest)
+		: FCommonOnlineSearchSettingsBase(InSearchRequest)
+	{
+		bIsLanQuery = (InSearchRequest->OnlineMode == ECommonSessionOnlineMode::LAN);
+		MaxSearchResults = 10;
+		PingBucketSize = 50;
+
+		QuerySettings.Set(SETTING_ONLINESUBSYSTEM_VERSION, true, EOnlineComparisonOp::Equals);
+
+		if (InSearchRequest->bUseLobbies)
+		{
+			QuerySettings.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
+		}
+	}
+
+	virtual ~FCommonOnlineSearchSettingsOSSv1() {}
+};
+#else
+
+class FCommonOnlineSearchSettingsOSSv2 : public FCommonOnlineSearchSettingsBase
+{
+public:
+	FCommonOnlineSearchSettingsOSSv2(UCommonSession_SearchSessionRequest* InSearchRequest)
+		: FCommonOnlineSearchSettingsBase(InSearchRequest)
+	{
+		FindLobbyParams.MaxResults = 10;
+
+		FindLobbyParams.Filters.Emplace(FFindLobbySearchFilter{ SETTING_ONLINESUBSYSTEM_VERSION, ESchemaAttributeComparisonOp::Equals, true });
+	}
+public:
+	FFindLobbies::Params FindLobbyParams;
+};
+
+#endif // COMMONUSER_OSSV1
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSession_HostSessionRequest
+
+FString UCommonSession_HostSessionRequest::GetMapName() const
+{
+	FAssetData MapAssetData;
+	if (UAssetManager::Get().GetPrimaryAssetData(MapID, /*out*/ MapAssetData))
+	{
+		return MapAssetData.PackageName.ToString();
+	}
+	else
+	{
+		return FString();
+	}
+}
+
+FString UCommonSession_HostSessionRequest::ConstructTravelURL() const
+{
+	FString CombinedExtraArgs;
+
+	if (OnlineMode == ECommonSessionOnlineMode::LAN)
+	{
+		CombinedExtraArgs += TEXT("?bIsLanMatch");
+	}
+	
+	if (OnlineMode != ECommonSessionOnlineMode::Offline)
+	{
+		CombinedExtraArgs += TEXT("?listen");
+	}
+
+	for (const auto& KVP : ExtraArgs)
+	{
+		if (!KVP.Key.IsEmpty())
+		{
+			if (KVP.Value.IsEmpty())
+			{
+				CombinedExtraArgs += FString::Printf(TEXT("?%s"), *KVP.Key);
+			}
+			else
+			{
+				CombinedExtraArgs += FString::Printf(TEXT("?%s=%s"), *KVP.Key, *KVP.Value);
+			}
+		}
+	}
+
+	//bIsRecordingDemo ? TEXT("?DemoRec") : TEXT(""));
+
+	return FString::Printf(TEXT("%s%s"),
+		*GetMapName(),
+		*CombinedExtraArgs);
+}
+
+bool UCommonSession_HostSessionRequest::ValidateAndLogErrors(FText& OutError) const
+{
+#if WITH_SERVER_CODE
+	if (GetMapName().IsEmpty())
+	{
+		OutError = FText::Format(NSLOCTEXT("NetworkErrors", "InvalidMapFormat", "Can't find asset data for MapID {0}, hosting request failed."), FText::FromString(MapID.ToString()));
+		return false;
+	}
+
+	return true;
+#else
+	// Client builds are only meant to connect to dedicated servers, they are missing the code to host a session by default
+	// You can change this behavior in subclasses to handle something like a tutorial
+	OutError = NSLOCTEXT("NetworkErrors", "ClientBuildCannotHost", "Client builds cannot host game sessions.");
+	return false;
+#endif
+}
+
+int32 UCommonSession_HostSessionRequest::GetMaxPlayers() const
+{
+	return MaxPlayerCount;
+}
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSessionSubsystem
+
+void UCommonSessionSubsystem::Initialize(FSubsystemCollectionBase& Collection)
+{
+	Super::Initialize(Collection);
+	BindOnlineDelegates();
+	GEngine->OnTravelFailure().AddUObject(this, &UCommonSessionSubsystem::TravelLocalSessionFailure);
+
+	FCoreUObjectDelegates::PostLoadMapWithWorld.AddUObject(this, &UCommonSessionSubsystem::HandlePostLoadMap);
+
+	UGameInstance* GameInstance = GetGameInstance();
+	bIsDedicatedServer = GameInstance->IsDedicatedServerInstance();
+}
+
+void UCommonSessionSubsystem::BindOnlineDelegates()
+{
+#if COMMONUSER_OSSV1
+	BindOnlineDelegatesOSSv1();
+#else
+	BindOnlineDelegatesOSSv2();
+#endif
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::BindOnlineDelegatesOSSv1()
+{
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+
+	const IOnlineSessionPtr SessionInterface = OnlineSub->GetSessionInterface();
+	check(SessionInterface.IsValid());
+
+	SessionInterface->AddOnCreateSessionCompleteDelegate_Handle(FOnCreateSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnCreateSessionComplete));
+	SessionInterface->AddOnStartSessionCompleteDelegate_Handle(FOnStartSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnStartSessionComplete));
+	SessionInterface->AddOnUpdateSessionCompleteDelegate_Handle(FOnUpdateSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnUpdateSessionComplete));
+	SessionInterface->AddOnEndSessionCompleteDelegate_Handle(FOnEndSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnEndSessionComplete));
+	SessionInterface->AddOnDestroySessionCompleteDelegate_Handle(FOnDestroySessionCompleteDelegate::CreateUObject(this, &ThisClass::OnDestroySessionComplete));
+	SessionInterface->AddOnDestroySessionRequestedDelegate_Handle(FOnDestroySessionRequestedDelegate::CreateUObject(this, &ThisClass::OnDestroySessionRequested));
+
+//	SessionInterface->AddOnMatchmakingCompleteDelegate_Handle(FOnMatchmakingCompleteDelegate::CreateUObject(this, &ThisClass::OnMatchmakingComplete));
+//	SessionInterface->AddOnCancelMatchmakingCompleteDelegate_Handle(FOnCancelMatchmakingCompleteDelegate::CreateUObject(this, &ThisClass::OnCancelMatchmakingComplete));
+
+	SessionInterface->AddOnFindSessionsCompleteDelegate_Handle(FOnFindSessionsCompleteDelegate::CreateUObject(this, &ThisClass::OnFindSessionsComplete));
+// 	SessionInterface->AddOnCancelFindSessionsCompleteDelegate_Handle(FOnCancelFindSessionsCompleteDelegate::CreateUObject(this, &ThisClass::OnCancelFindSessionsComplete));
+// 	SessionInterface->AddOnPingSearchResultsCompleteDelegate_Handle(FOnPingSearchResultsCompleteDelegate::CreateUObject(this, &ThisClass::OnPingSearchResultsComplete));
+	SessionInterface->AddOnJoinSessionCompleteDelegate_Handle(FOnJoinSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnJoinSessionComplete));
+
+//	TWO_PARAM(OnSessionParticipantJoined, FName, const FUniqueNetId&);
+//	THREE_PARAM(OnSessionParticipantLeft, FName, const FUniqueNetId&, EOnSessionParticipantLeftReason);
+//	ONE_PARAM(OnQosDataRequested, FName);
+//	TWO_PARAM(OnSessionCustomDataChanged, FName, const FOnlineSessionSettings&);
+//	TWO_PARAM(OnSessionSettingsUpdated, FName, const FOnlineSessionSettings&);
+//	THREE_PARAM(OnSessionParticipantSettingsUpdated, FName, const FUniqueNetId&, const FOnlineSessionSettings&);
+//	FOUR_PARAM(OnSessionInviteReceived, const FUniqueNetId& /*UserId*/, const FUniqueNetId& /*FromId*/, const FString& /*AppId*/, const FOnlineSessionSearchResult& /*InviteResult*/);
+//	THREE_PARAM(OnRegisterPlayersComplete, FName, const TArray< FUniqueNetIdRef >&, bool);
+//	THREE_PARAM(OnUnregisterPlayersComplete, FName, const TArray< FUniqueNetIdRef >&, bool);
+
+	SessionInterface->AddOnSessionUserInviteAcceptedDelegate_Handle(FOnSessionUserInviteAcceptedDelegate::CreateUObject(this, &ThisClass::HandleSessionUserInviteAccepted));
+	SessionInterface->AddOnSessionFailureDelegate_Handle(FOnSessionFailureDelegate::CreateUObject(this, &ThisClass::HandleSessionFailure));
+}
+
+#else
+
+void UCommonSessionSubsystem::BindOnlineDelegatesOSSv2()
+{
+	// TODO: Bind OSSv2 delegates when they are available
+	// Note that most OSSv1 delegates above are implemented as completion delegates in OSSv2 and don't need to be subscribed to
+	TSharedPtr<IOnlineServices> OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+	ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();
+	if (ensure(Lobbies))
+	{
+		LobbyJoinRequestedHandle = Lobbies->OnUILobbyJoinRequested().Add(this, &UCommonSessionSubsystem::OnLobbyJoinRequested);
+	}
+
+	ISessionsPtr Sessions = OnlineServices->GetSessionsInterface();
+	if (ensure(Sessions))
+	{
+		SessionJoinRequestedHandle = Sessions->OnUISessionJoinRequested().Add(this, &UCommonSessionSubsystem::OnSessionJoinRequested);
+	}
+}
+#endif
+
+void UCommonSessionSubsystem::Deinitialize()
+{
+#if COMMONUSER_OSSV1
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+
+	if (OnlineSub)
+	{
+		// During shutdown this may not be valid
+		const IOnlineSessionPtr SessionInterface = OnlineSub->GetSessionInterface();
+		if (SessionInterface)
+		{
+			SessionInterface->ClearOnSessionFailureDelegates(this);
+		}
+	}
+#endif // COMMONUSER_OSSV1
+
+	if (GEngine)
+	{
+		GEngine->OnTravelFailure().RemoveAll(this);
+	}
+
+	FCoreUObjectDelegates::PostLoadMapWithWorld.RemoveAll(this);
+
+	Super::Deinitialize();
+}
+
+bool UCommonSessionSubsystem::ShouldCreateSubsystem(UObject* Outer) const
+{
+	TArray<UClass*> ChildClasses;
+	GetDerivedClasses(GetClass(), ChildClasses, false);
+
+	// Only create an instance if there is not a game-specific subclass
+	return ChildClasses.Num() == 0;
+}
+
+UCommonSession_HostSessionRequest* UCommonSessionSubsystem::CreateOnlineHostSessionRequest()
+{
+	/** Game-specific subsystems can override this or you can modify after creation */
+
+	UCommonSession_HostSessionRequest* NewRequest = NewObject<UCommonSession_HostSessionRequest>(this);
+	NewRequest->OnlineMode = ECommonSessionOnlineMode::Online;
+	NewRequest->bUseLobbies = bUseLobbiesDefault;
+	NewRequest->bUseLobbiesVoiceChat = bUseLobbiesVoiceChatDefault;
+
+	// We enable presence by default in the primary session used for matchmaking. For online systems that care about presence, only the primary session should have presence enabled
+	NewRequest->bUsePresence = !IsRunningDedicatedServer();
+
+	return NewRequest;
+}
+
+UCommonSession_SearchSessionRequest* UCommonSessionSubsystem::CreateOnlineSearchSessionRequest()
+{
+	/** Game-specific subsystems can override this or you can modify after creation */
+
+	UCommonSession_SearchSessionRequest* NewRequest = NewObject<UCommonSession_SearchSessionRequest>(this);
+	NewRequest->OnlineMode = ECommonSessionOnlineMode::Online;
+
+	NewRequest->bUseLobbies = bUseLobbiesDefault;
+
+	return NewRequest;
+}
+
+void UCommonSessionSubsystem::HostSession(APlayerController* HostingPlayer, UCommonSession_HostSessionRequest* Request)
+{
+	if (Request == nullptr)
+	{
+		SetCreateSessionError(NSLOCTEXT("NetworkErrors", "InvalidRequest", "HostSession passed an invalid request."));
+		OnCreateSessionComplete(NAME_None, false);
+		return;
+	}
+
+	ULocalPlayer* LocalPlayer = (HostingPlayer != nullptr) ? HostingPlayer->GetLocalPlayer() : nullptr;
+	if (LocalPlayer == nullptr && !bIsDedicatedServer)
+	{
+		SetCreateSessionError(NSLOCTEXT("NetworkErrors", "InvalidHostingPlayer", "HostingPlayer is invalid."));
+		OnCreateSessionComplete(NAME_None, false);
+		return;
+	}
+
+	FText OutError;
+	if (!Request->ValidateAndLogErrors(OutError))
+	{
+		SetCreateSessionError(OutError);
+		OnCreateSessionComplete(NAME_None, false);
+		return;
+	}
+
+	if (Request->OnlineMode == ECommonSessionOnlineMode::Offline)
+	{
+		if (GetWorld()->GetNetMode() == NM_Client)
+		{
+			SetCreateSessionError(NSLOCTEXT("NetworkErrors", "CannotHostAsClient", "Cannot host offline game as client."));
+			OnCreateSessionComplete(NAME_None, false);
+			return;
+		}
+		else
+		{
+			// Offline so travel to the specified match URL immediately
+			GetWorld()->ServerTravel(Request->ConstructTravelURL());
+		}
+	}
+	else
+	{
+		CreateOnlineSessionInternal(LocalPlayer, Request);
+	}
+
+	NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, Request->ModeNameForAdvertisement, Request->GetMapName());
+}
+
+void UCommonSessionSubsystem::CreateOnlineSessionInternal(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request)
+{
+	CreateSessionResult = FOnlineResultInformation();
+	PendingTravelURL = Request->ConstructTravelURL();
+
+#if COMMONUSER_OSSV1
+	CreateOnlineSessionInternalOSSv1(LocalPlayer, Request);
+#else
+	CreateOnlineSessionInternalOSSv2(LocalPlayer, Request);
+#endif
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::CreateOnlineSessionInternalOSSv1(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request)
+{
+	const FName SessionName(NAME_GameSession);
+	const int32 MaxPlayers = Request->GetMaxPlayers();
+
+	IOnlineSubsystem* const OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions);
+
+	FUniqueNetIdPtr UserId;
+	if (LocalPlayer)
+	{
+		UserId = LocalPlayer->GetPreferredUniqueNetId().GetUniqueNetId();
+	}
+	else if (bIsDedicatedServer)
+	{
+		UserId = OnlineSub->GetIdentityInterface()->GetUniquePlayerId(DEDICATED_SERVER_USER_INDEX);
+	}
+
+	//@TODO: You can get here on some platforms while trying to do a LAN session, does that require a valid user id?
+	if (ensure(UserId.IsValid()))
+	{
+		FCommonSession_OnlineSessionSettings HostSettings(Request->OnlineMode == ECommonSessionOnlineMode::LAN, Request->bUsePresence, MaxPlayers);
+		HostSettings.bUseLobbiesIfAvailable = Request->bUseLobbies;
+		HostSettings.bUseLobbiesVoiceChatIfAvailable = Request->bUseLobbiesVoiceChat;
+		HostSettings.Set(SETTING_GAMEMODE, Request->ModeNameForAdvertisement, EOnlineDataAdvertisementType::ViaOnlineService);
+		HostSettings.Set(SETTING_MAPNAME, Request->GetMapName(), EOnlineDataAdvertisementType::ViaOnlineService);
+		//@TODO: HostSettings.Set(SETTING_MATCHING_HOPPER, FString("TeamDeathmatch"), EOnlineDataAdvertisementType::DontAdvertise);
+		HostSettings.Set(SETTING_MATCHING_TIMEOUT, 120.0f, EOnlineDataAdvertisementType::ViaOnlineService);
+		HostSettings.Set(SETTING_SESSION_TEMPLATE_NAME, FString(TEXT("GameSession")), EOnlineDataAdvertisementType::ViaOnlineService);
+		HostSettings.Set(SETTING_ONLINESUBSYSTEM_VERSION, true, EOnlineDataAdvertisementType::ViaOnlineService);
+
+		Sessions->CreateSession(*UserId, SessionName, HostSettings);
+		NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, Request->ModeNameForAdvertisement, Request->GetMapName());
+	}
+	else
+	{
+		OnCreateSessionComplete(SessionName, false);
+	}
+}
+
+#else
+
+void UCommonSessionSubsystem::CreateOnlineSessionInternalOSSv2(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request)
+{
+	const FName SessionName(NAME_GameSession);
+	const int32 MaxPlayers = Request->GetMaxPlayers();
+	IOnlineServicesPtr OnlineServices = GetServices(GetWorld());
+
+	check(OnlineServices);
+
+	FString ModeName = Request->ModeNameForAdvertisement;
+	FString MapName = Request->GetMapName();
+
+	if(!Request->bUseLobbies)
+	{
+		ISessionsPtr Sessions = OnlineServices->GetSessionsInterface();
+		check(Sessions);
+		FCreateSession::Params CreateParams;
+
+		if (LocalPlayer)
+		{
+			CreateParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+		}
+		else if (bIsDedicatedServer)
+		{
+			// TODO what should this do for v2?
+		}
+
+		CreateParams.SessionName = SessionName;
+		CreateParams.bPresenceEnabled = Request->bUsePresence;
+		CreateParams.SessionSettings.SchemaName = FSchemaId(TEXT("GameLobby")); // TODO: make a parameter
+		CreateParams.SessionSettings.NumMaxConnections = MaxPlayers;
+		CreateParams.SessionSettings.JoinPolicy = ESessionJoinPolicy::Public; // TODO: Check parameters
+
+		CreateParams.SessionSettings.CustomSettings.Emplace(SETTING_GAMEMODE, Request->ModeNameForAdvertisement);
+		CreateParams.SessionSettings.CustomSettings.Emplace(SETTING_MAPNAME, Request->GetMapName());
+		//@TODO: CreateParams.CustomSettings.Emplace(SETTING_MATCHING_HOPPER, FString("TeamDeathmatch"));
+		CreateParams.SessionSettings.CustomSettings.Emplace(SETTING_MATCHING_TIMEOUT, 120.0f);
+		CreateParams.SessionSettings.CustomSettings.Emplace(SETTING_SESSION_TEMPLATE_NAME, FString(TEXT("GameSession")));
+		CreateParams.SessionSettings.CustomSettings.Emplace(SETTING_ONLINESUBSYSTEM_VERSION, true);
+
+		Sessions->CreateSession(MoveTemp(CreateParams)).OnComplete(this, [this, SessionName, ModeName, MapName](const TOnlineResult<FCreateSession>& CreateResult)
+			{
+				OnCreateSessionComplete(SessionName, CreateResult.IsOk());
+				NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, ModeName, MapName);
+			});
+	}
+	else
+	{
+		ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();
+		check(Lobbies);
+		FCreateLobby::Params CreateParams;
+
+		if (LocalPlayer)
+		{
+			CreateParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+		}
+		else if (bIsDedicatedServer)
+		{
+			// TODO what should this do for v2?
+		}
+
+		CreateParams.LocalName = SessionName;
+		CreateParams.SchemaId = FSchemaId(TEXT("GameLobby")); // TODO: make a parameter
+		CreateParams.bPresenceEnabled = Request->bUsePresence;
+		CreateParams.MaxMembers = MaxPlayers;
+		CreateParams.JoinPolicy = ELobbyJoinPolicy::PublicAdvertised; // TODO: Check parameters
+
+		CreateParams.Attributes.Emplace(SETTING_GAMEMODE, Request->ModeNameForAdvertisement);
+		CreateParams.Attributes.Emplace(SETTING_MAPNAME, Request->GetMapName());
+		//@TODO: CreateParams.Attributes.Emplace(SETTING_MATCHING_HOPPER, FString("TeamDeathmatch"));
+		CreateParams.Attributes.Emplace(SETTING_MATCHING_TIMEOUT, 120.0f);
+		CreateParams.Attributes.Emplace(SETTING_SESSION_TEMPLATE_NAME, FString(TEXT("GameSession")));
+		CreateParams.Attributes.Emplace(SETTING_ONLINESUBSYSTEM_VERSION, true);
+
+		CreateParams.UserAttributes.Emplace(SETTING_GAMEMODE, FString(TEXT("GameSession")));
+
+		// TODO: Add splitscreen players
+
+		Lobbies->CreateLobby(MoveTemp(CreateParams)).OnComplete(this, [this, SessionName, ModeName, MapName](const TOnlineResult<FCreateLobby>& CreateResult)
+			{
+				OnCreateSessionComplete(SessionName, CreateResult.IsOk());
+				NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, ModeName, MapName);
+			});
+	}
+}
+
+#endif
+
+void UCommonSessionSubsystem::OnCreateSessionComplete(FName SessionName, bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnCreateSessionComplete(SessionName: %s, bWasSuccessful: %d)"), *SessionName.ToString(), bWasSuccessful);
+
+#if COMMONUSER_OSSV1 // OSSv2 joins splitscreen players as part of the create call
+	// Add the splitscreen player if one exists
+#if 0 //@TODO:
+	if (bWasSuccessful && LocalPlayers.Num() > 1)
+	{
+		IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+		if (Sessions.IsValid() && LocalPlayers[1]->GetPreferredUniqueNetId().IsValid())
+		{
+			Sessions->RegisterLocalPlayer(*LocalPlayers[1]->GetPreferredUniqueNetId(), NAME_GameSession,
+				FOnRegisterLocalPlayerCompleteDelegate::CreateUObject(this, &ThisClass::OnRegisterLocalPlayerComplete_CreateSession));
+		}
+	}
+	else
+#endif
+#endif
+	{
+		// We either failed or there is only a single local user
+		FinishSessionCreation(bWasSuccessful);
+	}
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::OnRegisterLocalPlayerComplete_CreateSession(const FUniqueNetId& PlayerId, EOnJoinSessionCompleteResult::Type Result)
+{
+	FinishSessionCreation(Result == EOnJoinSessionCompleteResult::Success);
+}
+
+void UCommonSessionSubsystem::OnStartSessionComplete(FName SessionName, bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnStartSessionComplete(SessionName: %s, bWasSuccessful: %d)"), *SessionName.ToString(), bWasSuccessful);
+
+	if (bWantToDestroyPendingSession)
+	{
+		CleanUpSessions();
+	}
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::FinishSessionCreation(bool bWasSuccessful)
+{
+	if (bWasSuccessful)
+	{
+		//@TODO Synchronize timing of this with join callbacks, modify both places and the comments if plan changes
+		CreateSessionResult = FOnlineResultInformation();
+		CreateSessionResult.bWasSuccessful = true;
+
+		if (bUseBeacons)
+		{
+			CreateHostReservationBeacon();
+		}
+
+		NotifyCreateSessionComplete(CreateSessionResult);
+
+		// Travel to the specified match URL
+		GetWorld()->ServerTravel(PendingTravelURL);
+	}
+	else
+	{
+		if (CreateSessionResult.bWasSuccessful || CreateSessionResult.ErrorText.IsEmpty())
+		{
+			FString ReturnError = TEXT("GenericFailure"); // TODO: No good way to get session error codes out of OSSV1
+			FText ReturnReason = NSLOCTEXT("NetworkErrors", "CreateSessionFailed", "Failed to create session.");
+
+			CreateSessionResult.bWasSuccessful = false;
+			CreateSessionResult.ErrorId = ReturnError;
+			CreateSessionResult.ErrorText = ReturnReason;
+		}
+
+		UE_LOG(LogCommonSession, Error, TEXT("FinishSessionCreation(%s): %s"), *CreateSessionResult.ErrorId, *CreateSessionResult.ErrorText.ToString());
+
+		NotifyCreateSessionComplete(CreateSessionResult);
+		NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+	}
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::OnUpdateSessionComplete(FName SessionName, bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnUpdateSessionComplete(SessionName: %s, bWasSuccessful: %s"), *SessionName.ToString(), bWasSuccessful ? TEXT("true") : TEXT("false"));
+}
+
+void UCommonSessionSubsystem::OnEndSessionComplete(FName SessionName, bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnEndSessionComplete(SessionName: %s, bWasSuccessful: %s)"), *SessionName.ToString(), bWasSuccessful ? TEXT("true") : TEXT("false"));
+	CleanUpSessions();
+}
+
+void UCommonSessionSubsystem::OnDestroySessionComplete(FName SessionName, bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnDestroySessionComplete(SessionName: %s, bWasSuccessful: %s)"), *SessionName.ToString(), bWasSuccessful ? TEXT("true") : TEXT("false"));
+	bWantToDestroyPendingSession = false;
+}
+
+void UCommonSessionSubsystem::OnDestroySessionRequested(int32 LocalUserNum, FName SessionName)
+{
+	FPlatformUserId PlatformUserId = IPlatformInputDeviceMapper::Get().GetPlatformUserForUserIndex(LocalUserNum);
+
+	NotifyDestroySessionRequested(PlatformUserId, SessionName);
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::FindSessions(APlayerController* SearchingPlayer, UCommonSession_SearchSessionRequest* Request)
+{
+	if (Request == nullptr)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("FindSessions passed a null request"));
+		return;
+	}
+
+#if COMMONUSER_OSSV1
+	FindSessionsInternal(SearchingPlayer, MakeShared<FCommonOnlineSearchSettingsOSSv1>(Request));
+#else
+	FindSessionsInternal(SearchingPlayer, MakeShared<FCommonOnlineSearchSettingsOSSv2>(Request));
+#endif // COMMONUSER_OSSV1
+}
+
+void UCommonSessionSubsystem::FindSessionsInternal(APlayerController* SearchingPlayer, const TSharedRef<FCommonOnlineSearchSettings>& InSearchSettings)
+{
+	if (SearchSettings.IsValid())
+	{
+		//@TODO: This is a poor user experience for the API user, we should let the additional search piggyback and
+		// just give it the same results as the currently pending one
+		// (or enqueue the request and service it when the previous one finishes or fails)
+		UE_LOG(LogCommonSession, Error, TEXT("A previous FindSessions call is still in progress, aborting"));
+		SearchSettings->SearchRequest->NotifySearchFinished(false, LOCTEXT("Error_FindSessionAlreadyInProgress", "Session search already in progress"));
+	}
+
+	ULocalPlayer* LocalPlayer = (SearchingPlayer != nullptr) ? SearchingPlayer->GetLocalPlayer() : nullptr;
+	if (LocalPlayer == nullptr)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("SearchingPlayer is invalid"));
+		InSearchSettings->SearchRequest->NotifySearchFinished(false, LOCTEXT("Error_FindSessionBadPlayer", "Session search was not provided a local player"));
+		return;
+	}
+
+	SearchSettings = InSearchSettings;
+#if COMMONUSER_OSSV1
+	FindSessionsInternalOSSv1(LocalPlayer);
+#else
+	FindSessionsInternalOSSv2(LocalPlayer);
+#endif
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::FindSessionsInternalOSSv1(ULocalPlayer* LocalPlayer)
+{
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions);
+
+	SearchSettings->QuerySettings.Set(SETTING_SESSION_TEMPLATE_NAME, FString("GameSession"), EOnlineComparisonOp::Equals);
+
+	if (!Sessions->FindSessions(*LocalPlayer->GetPreferredUniqueNetId().GetUniqueNetId(), StaticCastSharedRef<FCommonOnlineSearchSettingsOSSv1>(SearchSettings.ToSharedRef())))
+	{
+		// Some session search failures will call this delegate inside the function, others will not
+		OnFindSessionsComplete(false);
+	}
+}
+
+#else
+
+void UCommonSessionSubsystem::FindSessionsInternalOSSv2(ULocalPlayer* LocalPlayer)
+{
+	IOnlineServicesPtr OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+	ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();
+	check(Lobbies);
+
+	FFindLobbies::Params FindLobbyParams = StaticCastSharedPtr<FCommonOnlineSearchSettingsOSSv2>(SearchSettings)->FindLobbyParams;
+	FindLobbyParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+
+	Lobbies->FindLobbies(MoveTemp(FindLobbyParams)).OnComplete(this, [this, LocalSearchSettings = SearchSettings](const TOnlineResult<FFindLobbies>& FindResult)
+	{
+		if (LocalSearchSettings != SearchSettings)
+		{
+			// This was an abandoned search, ignore
+			return;
+		}
+		const bool bWasSuccessful = FindResult.IsOk();
+		UE_LOG(LogCommonSession, Log, TEXT("FindLobbies(bWasSuccessful: %s)"), *LexToString(bWasSuccessful));
+		check(SearchSettings.IsValid());
+		if (bWasSuccessful)
+		{
+			const FFindLobbies::Result& FindResults = FindResult.GetOkValue();
+			SearchSettings->SearchRequest->Results.Reset(FindResults.Lobbies.Num());
+
+			for (const TSharedRef<const FLobby>& Lobby : FindResults.Lobbies)
+			{
+				if (!Lobby->OwnerAccountId.IsValid())
+				{
+					UE_LOG(LogCommonSession, Verbose, TEXT("\tIgnoring Lobby with no owner (LobbyId: %s)"),
+						*ToLogString(Lobby->LobbyId));
+				}
+				else if (Lobby->Members.Num() == 0)
+				{
+					UE_LOG(LogCommonSession, Verbose, TEXT("\tIgnoring Lobby with no members (UserId: %s)"),
+						*ToLogString(Lobby->OwnerAccountId));
+				}
+				else
+				{
+					UCommonSession_SearchResult* Entry = NewObject<UCommonSession_SearchResult>(SearchSettings->SearchRequest);
+					Entry->Lobby = Lobby;
+					SearchSettings->SearchRequest->Results.Add(Entry);
+
+					UE_LOG(LogCommonSession, Log, TEXT("\tFound lobby (UserId: %s, NumOpenConns: %d)"),
+						*ToLogString(Lobby->OwnerAccountId), Lobby->MaxMembers - Lobby->Members.Num());
+				}
+			}
+		}
+		else
+		{
+			SearchSettings->SearchRequest->Results.Empty();
+		}
+
+		const FText ResultText = bWasSuccessful ? FText() : FindResult.GetErrorValue().GetText();
+
+		SearchSettings->SearchRequest->NotifySearchFinished(bWasSuccessful, ResultText);
+		SearchSettings.Reset();
+	});
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::QuickPlaySession(APlayerController* JoiningOrHostingPlayer, UCommonSession_HostSessionRequest* HostRequest)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("QuickPlay Requested"));
+
+	if (HostRequest == nullptr)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("QuickPlaySession passed a null request"));
+		return;
+	}
+
+	TStrongObjectPtr<UCommonSession_HostSessionRequest> HostRequestPtr = TStrongObjectPtr<UCommonSession_HostSessionRequest>(HostRequest);
+	TWeakObjectPtr<APlayerController> JoiningOrHostingPlayerPtr = TWeakObjectPtr<APlayerController>(JoiningOrHostingPlayer);
+
+	UCommonSession_SearchSessionRequest* QuickPlayRequest = CreateOnlineSearchSessionRequest();
+	QuickPlayRequest->OnSearchFinished.AddUObject(this, &UCommonSessionSubsystem::HandleQuickPlaySearchFinished, JoiningOrHostingPlayerPtr, HostRequestPtr);
+
+	// We enable presence by default on the primary session used for matchmaking. For online systems that care about presence, only the primary session should have presence enabled
+
+	HostRequestPtr->bUseLobbies = bUseLobbiesDefault;
+	HostRequestPtr->bUseLobbiesVoiceChat = bUseLobbiesVoiceChatDefault;
+	HostRequestPtr->bUsePresence = true;
+	QuickPlayRequest->bUseLobbies = bUseLobbiesDefault;
+
+	NotifySessionInformationUpdated(ECommonSessionInformationState::Matchmaking);
+	FindSessionsInternal(JoiningOrHostingPlayer, CreateQuickPlaySearchSettings(HostRequest, QuickPlayRequest));
+}
+
+TSharedRef<FCommonOnlineSearchSettings> UCommonSessionSubsystem::CreateQuickPlaySearchSettings(UCommonSession_HostSessionRequest* HostRequest, UCommonSession_SearchSessionRequest* SearchRequest)
+{
+#if COMMONUSER_OSSV1
+	return CreateQuickPlaySearchSettingsOSSv1(HostRequest, SearchRequest);
+#else
+	return CreateQuickPlaySearchSettingsOSSv2(HostRequest, SearchRequest);
+#endif // COMMONUSER_OSSV1
+}
+
+#if COMMONUSER_OSSV1
+TSharedRef<FCommonOnlineSearchSettings> UCommonSessionSubsystem::CreateQuickPlaySearchSettingsOSSv1(UCommonSession_HostSessionRequest* HostRequest, UCommonSession_SearchSessionRequest* SearchRequest)
+{
+	TSharedRef<FCommonOnlineSearchSettingsOSSv1> QuickPlaySearch = MakeShared<FCommonOnlineSearchSettingsOSSv1>(SearchRequest);
+
+	/** By default quick play does not want to include the map or game mode, games can fill this in as desired
+	if (!HostRequest->ModeNameForAdvertisement.IsEmpty())
+	{
+		QuickPlaySearch->QuerySettings.Set(SETTING_GAMEMODE, HostRequest->ModeNameForAdvertisement, EOnlineComparisonOp::Equals);
+	}
+
+	if (!HostRequest->GetMapName().IsEmpty())
+	{
+		QuickPlaySearch->QuerySettings.Set(SETTING_MAPNAME, HostRequest->GetMapName(), EOnlineComparisonOp::Equals);
+	} 
+	*/
+
+	// QuickPlaySearch->QuerySettings.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
+	return QuickPlaySearch;
+}
+
+#else
+
+TSharedRef<FCommonOnlineSearchSettings> UCommonSessionSubsystem::CreateQuickPlaySearchSettingsOSSv2(UCommonSession_HostSessionRequest* HostRequest, UCommonSession_SearchSessionRequest* SearchRequest)
+{
+	TSharedRef<FCommonOnlineSearchSettingsOSSv2> QuickPlaySearch = MakeShared<FCommonOnlineSearchSettingsOSSv2>(SearchRequest);
+
+	/** By default quick play does not want to include the map or game mode, games can fill this in as desired
+	if (!HostRequest->ModeNameForAdvertisement.IsEmpty())
+	{
+		QuickPlaySearch->FindLobbyParams.Filters.Emplace(FFindLobbySearchFilter{SETTING_GAMEMODE, ESchemaAttributeComparisonOp::Equals, HostRequest->ModeNameForAdvertisement});
+	}
+	if (!HostRequest->GetMapName().IsEmpty())
+	{
+		QuickPlaySearch->FindLobbyParams.Filters.Emplace(FFindLobbySearchFilter{SETTING_MAPNAME, ESchemaAttributeComparisonOp::Equals, HostRequest->GetMapName()});
+	}
+	*/
+
+	return QuickPlaySearch;
+}
+
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::HandleQuickPlaySearchFinished(bool bSucceeded, const FText& ErrorMessage, TWeakObjectPtr<APlayerController> JoiningOrHostingPlayer, TStrongObjectPtr<UCommonSession_HostSessionRequest> HostRequest)
+{
+	const int32 ResultCount = SearchSettings->SearchRequest->Results.Num();
+	UE_LOG(LogCommonSession, Log, TEXT("QuickPlay Search Finished %s (Results %d) (Error: %s)"), bSucceeded ? TEXT("Success") : TEXT("Failed"), ResultCount, *ErrorMessage.ToString());
+
+	//@TODO: We have to check if the error message is empty because some OSS layers report a failure just because there are no sessions.  Please fix with OSS 2.0.
+	if (bSucceeded || ErrorMessage.IsEmpty())
+	{
+		// Join the best search result.
+		if (ResultCount > 0)
+		{
+			//@TODO: We should probably look at ping?  maybe some other factors to find the best.  Idk if they come pre-sorted or not.
+			for (UCommonSession_SearchResult* Result : SearchSettings->SearchRequest->Results)
+			{
+				JoinSession(JoiningOrHostingPlayer.Get(), Result);
+				return;
+			}
+		}
+		else
+		{
+			HostSession(JoiningOrHostingPlayer.Get(), HostRequest.Get());
+		}
+	}
+	else
+	{
+		//@TODO: This sucks, need to tell someone.
+		NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+	}
+}
+
+void UCommonSessionSubsystem::CleanUpSessions()
+{
+	bWantToDestroyPendingSession = true;
+
+	if (bUseBeacons)
+	{
+		DestroyHostReservationBeacon();
+	}
+
+	NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+#if COMMONUSER_OSSV1
+	CleanUpSessionsOSSv1();
+#else
+	CleanUpSessionsOSSv2();
+#endif // COMMONUSER_OSSV1
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::CleanUpSessionsOSSv1()
+{
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions);
+
+	EOnlineSessionState::Type SessionState = Sessions->GetSessionState(NAME_GameSession);
+	UE_LOG(LogCommonSession, Log, TEXT("Session state is %s"), EOnlineSessionState::ToString(SessionState));
+
+	if (EOnlineSessionState::InProgress == SessionState)
+	{
+		UE_LOG(LogCommonSession, Log, TEXT("Ending session because of return to front end"));
+		Sessions->EndSession(NAME_GameSession);
+	}
+	else if (EOnlineSessionState::Ending == SessionState)
+	{
+		UE_LOG(LogCommonSession, Log, TEXT("Waiting for session to end on return to main menu"));
+	}
+	else if (EOnlineSessionState::Ended == SessionState || EOnlineSessionState::Pending == SessionState)
+	{
+		UE_LOG(LogCommonSession, Log, TEXT("Destroying session on return to main menu"));
+		Sessions->DestroySession(NAME_GameSession);
+	}
+	else if (EOnlineSessionState::Starting == SessionState || EOnlineSessionState::Creating == SessionState)
+	{
+		UE_LOG(LogCommonSession, Log, TEXT("Waiting for session to start, and then we will end it to return to main menu"));
+	}
+}
+
+#else
+void UCommonSessionSubsystem::CleanUpSessionsOSSv2()
+{
+	IOnlineServicesPtr OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+	ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();	
+	ISessionsPtr Sessions = OnlineServices->GetSessionsInterface();
+	
+	FAccountId LocalPlayerId = GetAccountId(GetGameInstance()->GetFirstLocalPlayerController());
+	
+	if (!LocalPlayerId.IsValid())
+	{
+		return;
+	}
+
+	if (bUseLobbiesDefault)
+	{
+		FLobbyId LobbyId = GetLobbyId(NAME_GameSession);
+
+		if (!LobbyId.IsValid())
+		{
+			return;
+		}
+		// TODO:  Include all local players leave the lobby/session
+		if (ensure(Lobbies))
+		{
+			Lobbies->LeaveLobby({ LocalPlayerId, LobbyId });
+		}
+	}
+	if (ensure(Sessions))
+	{
+		Sessions->LeaveSession({ LocalPlayerId, NAME_GameSession, false });
+	}
+}
+
+#endif // COMMONUSER_OSSV1
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::OnFindSessionsComplete(bool bWasSuccessful)
+{
+	UE_LOG(LogCommonSession, Log, TEXT("OnFindSessionsComplete(bWasSuccessful: %s)"), bWasSuccessful ? TEXT("true") : TEXT("false"));
+
+	if (!SearchSettings.IsValid())
+	{
+		// This could get called twice for failed session searches, or for a search requested by a different system
+		return;
+	}
+
+	FCommonOnlineSearchSettingsOSSv1& SearchSettingsV1 = *StaticCastSharedPtr<FCommonOnlineSearchSettingsOSSv1>(SearchSettings);
+	if (SearchSettingsV1.SearchState == EOnlineAsyncTaskState::InProgress)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("OnFindSessionsComplete called when search is still in progress!"));
+		return;
+	}
+
+	if (!ensure(SearchSettingsV1.SearchRequest))
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("OnFindSessionsComplete called with invalid search request object!"));
+		return;
+	}
+
+	if (bWasSuccessful)
+	{
+		SearchSettingsV1.SearchRequest->Results.Reset(SearchSettingsV1.SearchResults.Num());
+
+		for (const FOnlineSessionSearchResult& Result : SearchSettingsV1.SearchResults)
+		{
+			check(Result.IsValid());
+
+			UCommonSession_SearchResult* Entry = NewObject<UCommonSession_SearchResult>(SearchSettingsV1.SearchRequest);
+			Entry->Result = Result;
+			SearchSettingsV1.SearchRequest->Results.Add(Entry);
+
+			FString SessionId = TEXT("Unknown");
+			if (Result.Session.SessionInfo.IsValid())
+			{
+				SessionId = Result.Session.SessionInfo->GetSessionId().ToString();
+			}
+
+			FString OwningUserId = TEXT("Unknown");
+			if (Result.Session.OwningUserId.IsValid())
+			{
+				OwningUserId = Result.Session.OwningUserId->ToString();
+			}
+
+			UE_LOG(LogCommonSession, Log, TEXT("\tFound session (SessionId: %s, UserId: %s, UserName: %s, NumOpenPrivConns: %d, NumOpenPubConns: %d, Ping: %d ms"),
+				*SessionId,
+				*OwningUserId,
+				*Result.Session.OwningUserName,
+				Result.Session.NumOpenPrivateConnections,
+				Result.Session.NumOpenPublicConnections,
+				Result.PingInMs
+				);
+		}
+	}
+	else
+	{
+		SearchSettingsV1.SearchRequest->Results.Empty();
+	}
+
+	if (0)
+	{
+		// Fake Sessions OSSV1
+		for (int i = 0; i < 10; i++)
+		{
+			UCommonSession_SearchResult* Entry = NewObject<UCommonSession_SearchResult>(SearchSettings->SearchRequest);
+			FOnlineSessionSearchResult FakeResult;
+			FakeResult.Session.OwningUserName = TEXT("Fake User");
+			FakeResult.Session.SessionSettings.NumPublicConnections = 10;
+			FakeResult.Session.SessionSettings.bShouldAdvertise = true;
+			FakeResult.Session.SessionSettings.bAllowJoinInProgress = true;
+			FakeResult.PingInMs=99;
+			Entry->Result = FakeResult;
+			SearchSettingsV1.SearchRequest->Results.Add(Entry);
+		}
+	}
+	
+	SearchSettingsV1.SearchRequest->NotifySearchFinished(bWasSuccessful, bWasSuccessful ? FText() : LOCTEXT("Error_FindSessionV1Failed", "Find session failed"));
+	SearchSettings.Reset();
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::JoinSession(APlayerController* JoiningPlayer, UCommonSession_SearchResult* Request)
+{
+
+	if (Request == nullptr)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("JoinSession passed a null request"));
+		return;
+	}
+
+	ULocalPlayer* LocalPlayer = (JoiningPlayer != nullptr) ? JoiningPlayer->GetLocalPlayer() : nullptr;
+	if (LocalPlayer == nullptr)
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("JoiningPlayer is invalid"));
+		return;
+	}
+
+	// Update presence here since we won't have the raw game mode and map name keys after client travel. If joining/travel fails, it is reset to main menu 
+	FString SessionGameMode, SessionMapName;
+	bool bEmpty;
+#if COMMONUSER_OSSV1
+	Request->GetStringSetting(SETTING_GAMEMODE, SessionGameMode, bEmpty);
+	Request->GetStringSetting(SETTING_MAPNAME, SessionMapName, bEmpty);
+	NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, SessionGameMode, SessionMapName);
+#else
+	if(Request->Lobby.IsValid())
+	{
+		Request->GetStringSetting(SETTING_GAMEMODE, SessionGameMode, bEmpty);
+		Request->GetStringSetting(SETTING_MAPNAME, SessionMapName, bEmpty);
+		NotifySessionInformationUpdated(ECommonSessionInformationState::InGame, SessionGameMode, SessionMapName);
+	}
+#endif // COMMONUSER_OSSV1
+
+	JoinSessionInternal(LocalPlayer, Request);
+}
+
+void UCommonSessionSubsystem::JoinSessionInternal(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request)
+{
+#if COMMONUSER_OSSV1
+	JoinSessionInternalOSSv1(LocalPlayer, Request);
+#else
+	JoinSessionInternalOSSv2(LocalPlayer, Request);
+#endif // COMMONUSER_OSSV1
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::JoinSessionInternalOSSv1(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request)
+{
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions);
+	
+	// We need to manually set that we want this to be our presence session
+	Request->Result.Session.SessionSettings.bUsesPresence = true;
+	Request->Result.Session.SessionSettings.bUseLobbiesIfAvailable = bUseLobbiesDefault;
+
+	Sessions->JoinSession(*LocalPlayer->GetPreferredUniqueNetId().GetUniqueNetId(), NAME_GameSession, Request->Result);
+}
+
+void UCommonSessionSubsystem::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result)
+{
+	// Add any splitscreen players if they exist
+	//@TODO:
+// 	if (Result == EOnJoinSessionCompleteResult::Success && LocalPlayers.Num() > 1)
+// 	{
+// 		IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+// 		if (Sessions.IsValid() && LocalPlayers[1]->GetPreferredUniqueNetId().IsValid())
+// 		{
+// 			Sessions->RegisterLocalPlayer(*LocalPlayers[1]->GetPreferredUniqueNetId(), NAME_GameSession,
+// 				FOnRegisterLocalPlayerCompleteDelegate::CreateUObject(this, &UShooterGameInstance::OnRegisterJoiningLocalPlayerComplete));
+// 		}
+// 	}
+// 	else
+ 	{
+		FinishJoinSession(Result);
+	}
+}
+
+void UCommonSessionSubsystem::OnRegisterJoiningLocalPlayerComplete(const FUniqueNetId& PlayerId, EOnJoinSessionCompleteResult::Type Result)
+{
+	FinishJoinSession(Result);
+}
+
+void UCommonSessionSubsystem::ConnectToHostReservationBeacon()
+{
+	UWorld* const World = GetWorld();
+	check(World);
+	ReservationBeaconClient = World->SpawnActor<APartyBeaconClient>(APartyBeaconClient::StaticClass());
+	check(ReservationBeaconClient.IsValid());
+
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(World);
+	check(OnlineSub);
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions);
+	FNamedOnlineSession* Session = Sessions->GetNamedSession(NAME_GameSession);
+	check(Session);
+	FString SessionIdStr = Session->GetSessionIdStr();
+
+	FString ConnectInfo;
+	Sessions->GetResolvedConnectString(NAME_GameSession, ConnectInfo, NAME_BeaconPort);
+
+	IOnlineIdentityPtr Identity = OnlineSub->GetIdentityInterface();
+	check(Identity);
+	FUniqueNetIdWrapper DefaultNetId = Identity->GetUniquePlayerId(0);
+	check(DefaultNetId.IsValid());
+
+	FPlayerReservation PlayerReservation;
+	PlayerReservation.UniqueId = *DefaultNetId;
+	PlayerReservation.Platform = OnlineSub->GetLocalPlatformName();
+
+	ReservationBeaconClient->OnHostConnectionFailure().BindWeakLambda(this, [this]()
+		{
+			// We only want to react to failure calls while the connection is active, not when it closes
+			if(ReservationBeaconClient->GetNetDriver())
+			{
+				FOnlineResultInformation JoinSessionResult;
+				JoinSessionResult.bWasSuccessful = false;
+				JoinSessionResult.ErrorId = TEXT("UnknownError");
+
+				NotifyJoinSessionComplete(JoinSessionResult);
+				NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+
+				CleanUpSessions();
+			}
+		});
+
+	ReservationBeaconClient->OnReservationRequestComplete().BindWeakLambda(this, [this](EPartyReservationResult::Type ReservationResponse)
+		{
+			if (ReservationResponse == EPartyReservationResult::ReservationAccepted)
+			{
+				FOnlineResultInformation JoinSessionResult;
+				JoinSessionResult.bWasSuccessful = true;
+				NotifyJoinSessionComplete(JoinSessionResult);
+
+				InternalTravelToSession(NAME_GameSession);
+			}
+			else
+			{
+				FOnlineResultInformation JoinSessionResult;
+				JoinSessionResult.bWasSuccessful = false;
+				JoinSessionResult.ErrorId = TEXT("UnknownError");
+
+				NotifyJoinSessionComplete(JoinSessionResult);
+				NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+
+				CleanUpSessions();
+			}
+		});
+
+	ReservationBeaconClient->RequestReservation(ConnectInfo, SessionIdStr, *DefaultNetId, { PlayerReservation });
+}
+
+void UCommonSessionSubsystem::FinishJoinSession(EOnJoinSessionCompleteResult::Type Result)
+{
+	if (Result == EOnJoinSessionCompleteResult::Success)
+	{
+		if (bUseBeacons)
+		{
+			// InternalTravelToSession and the notification will be called by the beacon after a successful reservation. The beacon will be destroyed during travel.
+			ConnectToHostReservationBeacon();
+		}
+		else
+		{
+			//@TODO Synchronize timing of this with create callbacks, modify both places and the comments if plan changes
+			FOnlineResultInformation JoinSessionResult;
+			JoinSessionResult.bWasSuccessful = true;
+			NotifyJoinSessionComplete(JoinSessionResult);
+
+			InternalTravelToSession(NAME_GameSession);
+		}
+	}
+	else
+	{
+		FText ReturnReason;
+		switch (Result)
+		{
+		case EOnJoinSessionCompleteResult::SessionIsFull:
+			ReturnReason = NSLOCTEXT("NetworkErrors", "SessionIsFull", "Game is full.");
+			break;
+		case EOnJoinSessionCompleteResult::SessionDoesNotExist:
+			ReturnReason = NSLOCTEXT("NetworkErrors", "SessionDoesNotExist", "Game no longer exists.");
+			break;
+		default:
+			ReturnReason = NSLOCTEXT("NetworkErrors", "JoinSessionFailed", "Join failed.");
+			break;
+		}
+
+		//@TODO: Error handling
+		UE_LOG(LogCommonSession, Error, TEXT("FinishJoinSession(Failed with Result: %s)"), *ReturnReason.ToString());
+
+		// No FOnlineError to initialize from
+		FOnlineResultInformation JoinSessionResult;
+		JoinSessionResult.bWasSuccessful = false;
+		JoinSessionResult.ErrorId = LexToString(Result); // This is not robust but there is no extended information available
+		JoinSessionResult.ErrorText = ReturnReason;
+		NotifyJoinSessionComplete(JoinSessionResult);
+		NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+
+		// If the session join failed, we'll clean up the session
+		CleanUpSessions();
+	}
+}
+
+#else
+
+void UCommonSessionSubsystem::JoinSessionInternalOSSv2(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request)
+{
+	const FName SessionName(NAME_GameSession);
+	IOnlineServicesPtr OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+
+	// If the request doesnt have a lobby assume it's a session
+	if (!Request->Lobby.IsValid())
+	{
+		ISessionsPtr Sessions = OnlineServices->GetSessionsInterface();
+		check(Sessions);
+		FJoinSession::Params CreateParams;
+
+		if (LocalPlayer)
+		{
+			CreateParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+		}
+		CreateParams.SessionName = SessionName;
+		CreateParams.SessionId = Request->SessionID;
+		UE::Online::FOnlineSessionId SessionID = Request->SessionID;
+
+		Sessions->JoinSession(MoveTemp(CreateParams)).OnComplete(this, [this, SessionName](const TOnlineResult<FJoinSession>& JoinResult)
+			{
+				if (JoinResult.IsOk())
+				{
+					InternalTravelToSession(SessionName);
+				}
+				else
+				{
+					//@TODO: Error handling
+					UE_LOG(LogCommonSession, Error, TEXT("JoinLobby Failed with Result: %s"), *ToLogString(JoinResult.GetErrorValue()));
+				}
+			});
+	}
+	else
+	{
+		 	ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();
+		 	check(Lobbies);
+		 
+		 	FJoinLobby::Params JoinParams;
+			if (LocalPlayer)
+			{
+				JoinParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+			}
+		 	JoinParams.LocalName = SessionName;
+		 	JoinParams.LobbyId = Request->Lobby->LobbyId;
+		 	JoinParams.bPresenceEnabled = true;
+		 
+		 	// Add any splitscreen players if they exist //@TODO: See UCommonSessionSubsystem::OnJoinSessionComplete
+		 
+		 	Lobbies->JoinLobby(MoveTemp(JoinParams)).OnComplete(this, [this, SessionName](const TOnlineResult<FJoinLobby>& JoinResult)
+		 	{
+		 		if (JoinResult.IsOk())
+		 		{
+		 			InternalTravelToSession(SessionName);
+		 		}
+		 		else
+		 		{
+		 			//@TODO: Error handling
+		 			UE_LOG(LogCommonSession, Error, TEXT("JoinLobby Failed with Result: %s"), *ToLogString(JoinResult.GetErrorValue()));
+		 		}
+		 	});
+	}
+}
+
+void UCommonSessionSubsystem::OnSessionJoinRequested(const UE::Online::FUISessionJoinRequested& EventParams)
+{
+	TSharedPtr<IOnlineServices> OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+	IAuthPtr Auth = OnlineServices->GetAuthInterface();
+	check(Auth);
+	TOnlineResult<FAuthGetLocalOnlineUserByOnlineAccountId> Account = Auth->GetLocalOnlineUserByOnlineAccountId({ EventParams.LocalAccountId });
+	if (Account.IsOk())
+	{
+		FPlatformUserId PlatformUserId = Account.GetOkValue().AccountInfo->PlatformUserId;
+		UCommonSession_SearchResult* RequestedSession = nullptr;
+		FOnlineResultInformation ResultInfo;
+		if (EventParams.Result.IsOk())
+		{
+			RequestedSession = NewObject<UCommonSession_SearchResult>(this);
+			RequestedSession->SessionID = EventParams.Result.GetOkValue();
+		}
+		else
+		{
+			ResultInfo.FromOnlineError(EventParams.Result.GetErrorValue());
+		}
+		NotifyUserRequestedSession(PlatformUserId, RequestedSession, ResultInfo);
+	}
+	else
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("OnJoinSessionRequested: Failed to get account by local user id %s"), *UE::Online::ToLogString(EventParams.LocalAccountId));
+	}
+}
+
+void UCommonSessionSubsystem::OnLobbyJoinRequested(const UE::Online::FUILobbyJoinRequested& EventParams)
+{
+	TSharedPtr<IOnlineServices> OnlineServices = GetServices(GetWorld());
+	check(OnlineServices);
+	IAuthPtr Auth = OnlineServices->GetAuthInterface();
+	check(Auth);
+	TOnlineResult<FAuthGetLocalOnlineUserByOnlineAccountId> Account = Auth->GetLocalOnlineUserByOnlineAccountId({ EventParams.LocalAccountId });
+	if (Account.IsOk())
+	{
+		FPlatformUserId PlatformUserId = Account.GetOkValue().AccountInfo->PlatformUserId;
+		UCommonSession_SearchResult* RequestedSession = nullptr;
+		FOnlineResultInformation ResultInfo;
+		if (EventParams.Result.IsOk())
+		{
+			RequestedSession = NewObject<UCommonSession_SearchResult>(this);
+			RequestedSession->Lobby = EventParams.Result.GetOkValue();
+		}
+		else
+		{
+			ResultInfo.FromOnlineError(EventParams.Result.GetErrorValue());
+		}
+		NotifyUserRequestedSession(PlatformUserId, RequestedSession, ResultInfo);
+	}
+	else
+	{
+		UE_LOG(LogCommonSession, Error, TEXT("OnJoinLobbyRequested: Failed to get account by local user id %s"), *UE::Online::ToLogString(EventParams.LocalAccountId));
+	}
+}
+
+UE::Online::FAccountId UCommonSessionSubsystem::GetAccountId(APlayerController* PlayerController) const
+{
+	if (const ULocalPlayer* const LocalPlayer = PlayerController->GetLocalPlayer())
+	{
+		FUniqueNetIdRepl LocalPlayerIdRepl = LocalPlayer->GetPreferredUniqueNetId();
+		if (LocalPlayerIdRepl.IsValid())
+		{
+			return LocalPlayerIdRepl.GetV2();
+		}
+	}
+	return FAccountId();
+}
+
+UE::Online::FLobbyId UCommonSessionSubsystem::GetLobbyId(const FName SessionName) const
+{
+	FAccountId LocalUserId = GetAccountId(GetGameInstance()->GetFirstLocalPlayerController());
+	if (LocalUserId.IsValid())
+	{
+		IOnlineServicesPtr OnlineServices = GetServices(GetWorld());
+		check(OnlineServices);
+		ILobbiesPtr Lobbies = OnlineServices->GetLobbiesInterface();
+		check(Lobbies);
+		TOnlineResult<FGetJoinedLobbies> JoinedLobbies = Lobbies->GetJoinedLobbies({ LocalUserId });
+		if (JoinedLobbies.IsOk())
+		{
+			for (const TSharedRef<const FLobby>& Lobby : JoinedLobbies.GetOkValue().Lobbies)
+			{
+				if (Lobby->LocalName == SessionName)
+				{
+					return Lobby->LobbyId;
+				}
+			}
+		}
+	}
+	return FLobbyId();
+}
+
+#endif // COMMONUSER_OSSV1
+void UCommonSessionSubsystem::InternalTravelToSession(const FName SessionName)
+{
+	//@TODO: Ideally we'd use triggering player instead of first (they're all gonna go at once so it probably doesn't matter)
+	APlayerController* const PlayerController = GetGameInstance()->GetFirstLocalPlayerController();
+	if (PlayerController == nullptr)
+	{
+		FText ReturnReason = NSLOCTEXT("NetworkErrors", "InvalidPlayerController", "Invalid Player Controller");
+		UE_LOG(LogCommonSession, Error, TEXT("InternalTravelToSession(Failed due to %s)"), *ReturnReason.ToString());
+		return;
+	}
+
+	FString URL;
+#if COMMONUSER_OSSV1
+	// travel to session
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+
+	IOnlineSessionPtr Sessions = OnlineSub->GetSessionInterface();
+	check(Sessions.IsValid());
+
+	if (!Sessions->GetResolvedConnectString(SessionName, URL))
+	{
+		FText FailReason = NSLOCTEXT("NetworkErrors", "TravelSessionFailed", "Travel to Session failed.");
+		UE_LOG(LogCommonSession, Error, TEXT("InternalTravelToSession(%s)"), *FailReason.ToString());
+		return;
+	}
+#else
+	TSharedPtr<IOnlineServices> OnlineServices = GetServices(GetWorld(), EOnlineServices::Default);
+	check(OnlineServices);
+
+	FAccountId LocalUserId = GetAccountId(PlayerController);
+	if (LocalUserId.IsValid())
+	{
+		TOnlineResult<FGetResolvedConnectString> Result;
+		if (!bUseLobbiesDefault)
+		{
+			ISessionsPtr Sessions = OnlineServices->GetSessionsInterface();
+			check(Sessions)
+			TOnlineResult<FGetSessionByName> SessionResult = Sessions->GetSessionByName({ SessionName });
+
+			if (SessionResult.IsOk())
+			{
+				Result = OnlineServices->GetResolvedConnectString({ LocalUserId, FLobbyId(), SessionResult.GetOkValue().Session->GetSessionId(), NAME_GamePort });
+			}
+		}
+		else
+		{
+			Result = OnlineServices->GetResolvedConnectString({ LocalUserId, GetLobbyId(SessionName) });
+		}
+
+		if (ensure(Result.IsOk()))
+		{
+			URL = Result.GetOkValue().ResolvedConnectString;
+		}
+	}
+#endif // COMMONUSER_OSSV1
+
+	// Allow modification of the URL prior to travel
+	OnPreClientTravelEvent.Broadcast(URL);
+
+	PlayerController->ClientTravel(URL, TRAVEL_Absolute);
+}
+
+void UCommonSessionSubsystem::NotifyUserRequestedSession(const FPlatformUserId& PlatformUserId, UCommonSession_SearchResult* RequestedSession, const FOnlineResultInformation& RequestedSessionResult)
+{
+	OnUserRequestedSessionEvent.Broadcast(PlatformUserId, RequestedSession, RequestedSessionResult);
+	K2_OnUserRequestedSessionEvent.Broadcast(PlatformUserId, RequestedSession, RequestedSessionResult);
+}
+
+void UCommonSessionSubsystem::NotifyJoinSessionComplete(const FOnlineResultInformation& Result)
+{
+	OnJoinSessionCompleteEvent.Broadcast(Result);
+	K2_OnJoinSessionCompleteEvent.Broadcast(Result);
+}
+
+void UCommonSessionSubsystem::NotifyCreateSessionComplete(const FOnlineResultInformation& Result)
+{
+	OnCreateSessionCompleteEvent.Broadcast(Result);
+	K2_OnCreateSessionCompleteEvent.Broadcast(Result);
+}
+
+void UCommonSessionSubsystem::NotifySessionInformationUpdated(ECommonSessionInformationState SessionStatus, const FString& GameMode, const FString& MapName)
+{
+	OnSessionInformationChangedEvent.Broadcast(SessionStatus, GameMode, MapName);
+	K2_OnSessionInformationChangedEvent.Broadcast(SessionStatus, GameMode, MapName);
+}
+
+void UCommonSessionSubsystem::NotifyDestroySessionRequested(const FPlatformUserId& PlatformUserId, const FName& SessionName)
+{
+	OnDestroySessionRequestedEvent.Broadcast(PlatformUserId, SessionName);
+	K2_OnDestroySessionRequestedEvent.Broadcast(PlatformUserId, SessionName);
+}
+
+void UCommonSessionSubsystem::SetCreateSessionError(const FText& ErrorText)
+{
+	CreateSessionResult.bWasSuccessful = false;
+	CreateSessionResult.ErrorId = TEXT("InternalFailure");
+
+	// TODO May want to replace with a generic error text in shipping builds depending on how much data you want to give users
+	CreateSessionResult.ErrorText = ErrorText;
+}
+
+void UCommonSessionSubsystem::CreateHostReservationBeacon()
+{
+	check(!BeaconHostListener.IsValid());
+	check(!ReservationBeaconHost.IsValid());
+
+	UWorld* const World = GetWorld();
+	BeaconHostListener = World->SpawnActor<AOnlineBeaconHost>(AOnlineBeaconHost::StaticClass());
+	check(BeaconHostListener.IsValid());
+	verify(BeaconHostListener->InitHost());
+
+	ReservationBeaconHost = World->SpawnActor<APartyBeaconHost>(APartyBeaconHost::StaticClass());
+	check(ReservationBeaconHost.IsValid());
+
+	if (ReservationBeaconHostState)
+	{
+		ReservationBeaconHost->InitFromBeaconState(&*ReservationBeaconHostState);
+	}
+	else
+	{
+		// TODO: We are using the default hard-coded values for the parameters for now, but they are configurable
+		ReservationBeaconHost->InitHostBeacon(BeaconTeamCount, BeaconTeamSize, BeaconMaxReservations, NAME_GameSession);
+		ReservationBeaconHostState = ReservationBeaconHost->GetState();
+	}
+
+	BeaconHostListener->RegisterHost(ReservationBeaconHost.Get());
+	BeaconHostListener->PauseBeaconRequests(false);
+}
+
+void UCommonSessionSubsystem::DestroyHostReservationBeacon()
+{
+	if (BeaconHostListener.IsValid() && ReservationBeaconHost.IsValid())
+	{
+		BeaconHostListener->UnregisterHost(ReservationBeaconHost->GetBeaconType());
+	}
+	if (BeaconHostListener.IsValid())
+	{
+		BeaconHostListener->Destroy();
+		BeaconHostListener = nullptr;
+	}
+	if (ReservationBeaconHost.IsValid())
+	{
+		ReservationBeaconHost->Destroy();
+		ReservationBeaconHost = nullptr;
+	}
+}
+
+#if COMMONUSER_OSSV1
+void UCommonSessionSubsystem::HandleSessionFailure(const FUniqueNetId& NetId, ESessionFailure::Type FailureType)
+{
+	UE_LOG(LogCommonSession, Warning, TEXT("UCommonSessionSubsystem::HandleSessionFailure(NetId: %s, FailureType: %s)"), *NetId.ToDebugString(), LexToString(FailureType));
+	
+	//@TODO: Probably need to do a bit more...
+}
+
+void UCommonSessionSubsystem::HandleSessionUserInviteAccepted(const bool bWasSuccessful, const int32 LocalUserIndex, FUniqueNetIdPtr AcceptingUserId, const FOnlineSessionSearchResult& SearchResult)
+{
+	FPlatformUserId PlatformUserId = IPlatformInputDeviceMapper::Get().GetPlatformUserForUserIndex(LocalUserIndex);
+
+	UCommonSession_SearchResult* RequestedSession = nullptr;
+	FOnlineResultInformation ResultInfo;
+	if (bWasSuccessful)
+	{
+		RequestedSession = NewObject<UCommonSession_SearchResult>(this);
+		RequestedSession->Result = SearchResult;
+	}
+	else
+	{
+		// No FOnlineError to initialize from
+		ResultInfo.bWasSuccessful = false;
+		ResultInfo.ErrorId = TEXT("failed"); // This is not robust but there is no extended information available
+		ResultInfo.ErrorText = LOCTEXT("Error_SessionUserInviteAcceptedFailed", "Failed to handle the join request");
+	}
+	NotifyUserRequestedSession(PlatformUserId, RequestedSession, ResultInfo);
+}
+
+#endif // COMMONUSER_OSSV1
+
+void UCommonSessionSubsystem::TravelLocalSessionFailure(UWorld* World, ETravelFailure::Type FailureType, const FString& ReasonString)
+{
+	// The delegate for this is global, but PIE can have more than one game instance, so make
+	// sure it's being raised for the same world this game instance subsystem is associated with
+	if (World != GetWorld())
+	{
+		return;
+	}
+
+	UE_LOG(LogCommonSession, Warning, TEXT("TravelLocalSessionFailure(World: %s, FailureType: %s, ReasonString: %s)"),
+		*GetPathNameSafe(World),
+		ETravelFailure::ToString(FailureType),
+		*ReasonString);
+
+	// TODO:  Broadcast this failure when we are also able to broadcast a success. Presently we broadcast a success before starting the travel, so a failure after a success is confusing.
+	//FOnlineResultInformation JoinSessionResult;
+	//JoinSessionResult.bWasSuccessful = false;
+	//JoinSessionResult.ErrorId = ReasonString; // TODO:  Is this an adequate ErrorId?
+	//JoinSessionResult.ErrorText = FText::FromString(ReasonString);
+	//NotifyJoinSessionComplete(JoinSessionResult);
+	NotifySessionInformationUpdated(ECommonSessionInformationState::OutOfGame);
+}
+
+void UCommonSessionSubsystem::HandlePostLoadMap(UWorld* World)
+{
+	// Ignore null worlds.
+	if (!World)
+	{
+		return;
+	}
+
+	// Ignore any world that isn't part of this game instance, which can be the case in the editor.
+	if (World->GetGameInstance() != GetGameInstance())
+	{
+		return;
+	}
+
+	// We don't care about updating the session unless the world type is game/pie.
+	if (!(World->WorldType == EWorldType::Game || World->WorldType == EWorldType::PIE))
+	{
+		return;
+	}
+
+#if COMMONUSER_OSSV1
+	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+	check(OnlineSub);
+
+	const IOnlineSessionPtr SessionInterface = OnlineSub->GetSessionInterface();
+	check(SessionInterface.IsValid());
+
+	const FName SessionName(NAME_GameSession);
+	FNamedOnlineSession* CurrentSession = SessionInterface->GetNamedSession(SessionName);
+
+	// If we're hosting a session, update the advertised map name.
+	if (CurrentSession != nullptr && CurrentSession->bHosting)
+	{
+		// This needs to be the full package path to match the host GetMapName function, World->GetMapName is currently the short name - update host settings
+		CurrentSession->SessionSettings.Set(SETTING_MAPNAME, UWorld::RemovePIEPrefix(World->GetOutermost()->GetName()), EOnlineDataAdvertisementType::ViaOnlineService);
+
+		SessionInterface->UpdateSession(SessionName, CurrentSession->SessionSettings, true);
+
+		if (bUseBeacons)
+		{
+			CreateHostReservationBeacon();
+		}
+	}
+#endif // COMMONUSER_OSSV1
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserBasicPresence.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserBasicPresence.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fd75a3f8d82023fad772ced8e783a4d8fb1abfd5
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserBasicPresence.cpp
@@ -0,0 +1,120 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+#include "CommonUserBasicPresence.h"
+#include "CommonSessionSubsystem.h"
+#include "Engine/GameInstance.h"
+#include "Engine/LocalPlayer.h"
+#include "CommonUserTypes.h"
+
+
+#if COMMONUSER_OSSV1
+#include "OnlineSubsystemUtils.h"
+#include "Interfaces/OnlinePresenceInterface.h"
+#else
+#include "Online/OnlineServicesEngineUtils.h"
+#include "Online/Presence.h"
+#endif
+
+DECLARE_LOG_CATEGORY_EXTERN(LogUserBasicPresence, Log, All);
+DEFINE_LOG_CATEGORY(LogUserBasicPresence);
+
+UCommonUserBasicPresence::UCommonUserBasicPresence()
+{
+
+}
+
+void UCommonUserBasicPresence::Initialize(FSubsystemCollectionBase& Collection)
+{
+	UCommonSessionSubsystem* CommonSession = Collection.InitializeDependency<UCommonSessionSubsystem>();
+	if(ensure(CommonSession))
+	{
+		CommonSession->OnSessionInformationChangedEvent.AddUObject(this, &UCommonUserBasicPresence::OnNotifySessionInformationChanged);
+	}
+}
+
+void UCommonUserBasicPresence::Deinitialize()
+{
+
+}
+
+FString UCommonUserBasicPresence::SessionStateToBackendKey(ECommonSessionInformationState SessionStatus)
+{
+	switch (SessionStatus)
+	{
+	case ECommonSessionInformationState::OutOfGame:
+		return PresenceStatusMainMenu;
+		break;
+	case ECommonSessionInformationState::Matchmaking:
+		return PresenceStatusMatchmaking;
+		break;
+	case ECommonSessionInformationState::InGame:
+		return PresenceStatusInGame;
+		break;
+	default:
+		UE_LOG(LogUserBasicPresence, Error, TEXT("UCommonUserBasicPresence::SessionStateToBackendKey: Found unknown enum value %d"), (uint8)SessionStatus);
+		return TEXT("Unknown");
+		break;
+
+	}
+}
+
+void UCommonUserBasicPresence::OnNotifySessionInformationChanged(ECommonSessionInformationState SessionStatus, const FString& GameMode, const FString& MapName)
+{
+	if (bEnableSessionsBasedPresence && !GetGameInstance()->IsDedicatedServerInstance())
+	{
+		// trim the map name since its a URL
+		FString MapNameTruncated = MapName;
+		if (!MapNameTruncated.IsEmpty())
+		{
+			int LastIndexOfSlash = 0;
+			MapNameTruncated.FindLastChar('/', LastIndexOfSlash);
+			MapNameTruncated = MapNameTruncated.RightChop(LastIndexOfSlash + 1);
+		}
+
+#if COMMONUSER_OSSV1
+		IOnlineSubsystem* OnlineSub = Online::GetSubsystem(GetWorld());
+		if(OnlineSub)
+		{
+			IOnlinePresencePtr Presence = OnlineSub->GetPresenceInterface();
+			if(Presence)
+			{
+				FOnlineUserPresenceStatus UpdatedPresence;
+				UpdatedPresence.State = EOnlinePresenceState::Online; // We'll only send the presence update if the user has a valid UniqueNetId, so we can assume they are Online
+				UpdatedPresence.StatusStr = *SessionStateToBackendKey(SessionStatus);
+				UpdatedPresence.Properties.Emplace(PresenceKeyGameMode, GameMode);
+				UpdatedPresence.Properties.Emplace(PresenceKeyMapName, MapNameTruncated);
+
+				for (const ULocalPlayer* LocalPlayer : GetGameInstance()->GetLocalPlayers())
+				{
+					if (LocalPlayer && LocalPlayer->GetPreferredUniqueNetId().GetUniqueNetId() != nullptr)
+					{
+						Presence->SetPresence(*LocalPlayer->GetPreferredUniqueNetId().GetUniqueNetId(), UpdatedPresence);
+					}
+				}
+			}
+		}
+
+#else
+
+		UE::Online::IOnlineServicesPtr OnlineServices = UE::Online::GetServices(GetWorld());
+		check(OnlineServices);
+		UE::Online::IPresencePtr Presence = OnlineServices->GetPresenceInterface();
+		if(Presence)
+		{
+			for (const ULocalPlayer* LocalPlayer : GetGameInstance()->GetLocalPlayers())
+			{
+				if (LocalPlayer && LocalPlayer->GetPreferredUniqueNetId().IsV2())
+				{
+					UE::Online::FPartialUpdatePresence::Params UpdateParams;
+					UpdateParams.LocalAccountId = LocalPlayer->GetPreferredUniqueNetId().GetV2();
+					UpdateParams.Mutations.StatusString.Emplace(*SessionStateToBackendKey(SessionStatus));
+					UpdateParams.Mutations.UpdatedProperties.Emplace(PresenceKeyGameMode, GameMode);
+					UpdateParams.Mutations.UpdatedProperties.Emplace(PresenceKeyMapName, MapNameTruncated);
+
+					Presence->PartialUpdatePresence(MoveTemp(UpdateParams));
+				}
+			}
+
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserModule.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserModule.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6e6b9d3c5642e4814c2fc6ec4a74ebb63a8d80c9
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserModule.cpp
@@ -0,0 +1,22 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonUserModule.h"
+
+#include "Modules/ModuleManager.h"
+
+#define LOCTEXT_NAMESPACE "FCommonUserModule"
+
+void FCommonUserModule::StartupModule()
+{
+	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
+}
+
+void FCommonUserModule::ShutdownModule()
+{
+	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+	// we call this function before unloading the module.
+}
+
+#undef LOCTEXT_NAMESPACE
+	
+IMPLEMENT_MODULE(FCommonUserModule, CommonUser)
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserSubsystem.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserSubsystem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cba743adb22e0966d27decba61434ac54c8e9c05
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserSubsystem.cpp
@@ -0,0 +1,2684 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonUserSubsystem.h"
+#include "Engine/GameInstance.h"
+#include "Engine/LocalPlayer.h"
+#include "GameFramework/PlayerController.h"
+#include "GameFramework/PlayerState.h"
+#include "InputKeyEventArgs.h"
+#include "NativeGameplayTags.h"
+#include "TimerManager.h"
+
+#include UE_INLINE_GENERATED_CPP_BY_NAME(CommonUserSubsystem)
+
+#if COMMONUSER_OSSV1
+#include "OnlineSubsystemNames.h"
+#include "OnlineSubsystemUtils.h"
+#else
+#include "Online/Auth.h"
+#include "Online/ExternalUI.h"
+#include "Online/OnlineResult.h"
+#include "Online/OnlineServices.h"
+#include "Online/OnlineServicesEngineUtils.h"
+#include "Online/Privileges.h"
+
+using namespace UE::Online;
+#endif
+
+DECLARE_LOG_CATEGORY_EXTERN(LogCommonUser, Log, All);
+DEFINE_LOG_CATEGORY(LogCommonUser);
+
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::SystemMessage_Error, "SystemMessage.Error");
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::SystemMessage_Warning, "SystemMessage.Warning");
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::SystemMessage_Display, "SystemMessage.Display");
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::SystemMessage_Error_InitializeLocalPlayerFailed, "SystemMessage.Error.InitializeLocalPlayerFailed");
+
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::Platform_Trait_RequiresStrictControllerMapping, "Platform.Trait.RequiresStrictControllerMapping");
+UE_DEFINE_GAMEPLAY_TAG(FCommonUserTags::Platform_Trait_SingleOnlineUser, "Platform.Trait.SingleOnlineUser");
+
+
+//////////////////////////////////////////////////////////////////////
+// UCommonUserInfo
+
+UCommonUserInfo::FCachedData* UCommonUserInfo::GetCachedData(ECommonUserOnlineContext Context)
+{
+	// Look up directly, game has a separate cache than default
+	FCachedData* FoundData = CachedDataMap.Find(Context);
+	if (FoundData)
+	{
+		return FoundData;
+	}
+
+	// Now try system resolution
+	UCommonUserSubsystem* Subsystem = GetSubsystem();
+
+	ECommonUserOnlineContext ResolvedContext = Subsystem->ResolveOnlineContext(Context);
+	return CachedDataMap.Find(ResolvedContext);
+}
+
+const UCommonUserInfo::FCachedData* UCommonUserInfo::GetCachedData(ECommonUserOnlineContext Context) const
+{
+	return const_cast<UCommonUserInfo*>(this)->GetCachedData(Context);
+}
+
+void UCommonUserInfo::UpdateCachedPrivilegeResult(ECommonUserPrivilege Privilege, ECommonUserPrivilegeResult Result, ECommonUserOnlineContext Context)
+{
+	// This should only be called with a resolved and valid type
+	FCachedData* GameCache = GetCachedData(ECommonUserOnlineContext::Game);
+	FCachedData* ContextCache = GetCachedData(Context);
+
+	if (!ensure(GameCache && ContextCache))
+	{
+		// Should always be valid
+		return;
+	}
+
+	// Update direct cache first
+	ContextCache->CachedPrivileges.Add(Privilege, Result);
+
+	if (GameCache != ContextCache)
+	{
+		// Look for another context to merge into game
+		ECommonUserPrivilegeResult GameContextResult = Result;
+		ECommonUserPrivilegeResult OtherContextResult = ECommonUserPrivilegeResult::Available;
+		for (TPair<ECommonUserOnlineContext, FCachedData>& Pair : CachedDataMap)
+		{
+			if (&Pair.Value != ContextCache && &Pair.Value != GameCache)
+			{
+				ECommonUserPrivilegeResult* FoundResult = Pair.Value.CachedPrivileges.Find(Privilege);
+				if (FoundResult)
+				{
+					OtherContextResult = *FoundResult;
+				}
+				else
+				{
+					OtherContextResult = ECommonUserPrivilegeResult::Unknown;
+				}
+				break;
+			}
+		}
+
+		if (GameContextResult == ECommonUserPrivilegeResult::Available && OtherContextResult != ECommonUserPrivilegeResult::Available)
+		{
+			// Other context is worse, use that
+			GameContextResult = OtherContextResult;
+		}
+
+		GameCache->CachedPrivileges.Add(Privilege, GameContextResult);
+	}
+}
+
+void UCommonUserInfo::UpdateCachedNetId(const FUniqueNetIdRepl& NewId, ECommonUserOnlineContext Context)
+{
+	FCachedData* ContextCache = GetCachedData(Context);
+
+	if (ensure(ContextCache))
+	{
+		ContextCache->CachedNetId = NewId;
+
+		// Update the nickname
+		const UCommonUserSubsystem* Subsystem = GetSubsystem();
+		if (ensure(Subsystem))
+		{
+			if (bIsGuest)
+			{
+				if (ContextCache->CachedNickname.IsEmpty())
+				{
+					// Set a default guest name if it is empty, can be changed with SetNickname
+					ContextCache->CachedNickname = NSLOCTEXT("CommonUser", "GuestNickname", "Guest").ToString();
+				}
+			}
+			else
+			{
+				// Refresh with the system nickname, overrides SetNickname
+				ContextCache->CachedNickname = Subsystem->GetLocalUserNickname(GetPlatformUserId(), Context);
+			}
+		}
+	}
+
+	// We don't merge the ids because of how guests work
+}
+
+class UCommonUserSubsystem* UCommonUserInfo::GetSubsystem() const
+{
+	return Cast<UCommonUserSubsystem>(GetOuter());
+}
+
+bool UCommonUserInfo::IsLoggedIn() const
+{
+	return (InitializationState == ECommonUserInitializationState::LoggedInLocalOnly || InitializationState == ECommonUserInitializationState::LoggedInOnline);
+}
+
+bool UCommonUserInfo::IsDoingLogin() const
+{
+	return (InitializationState == ECommonUserInitializationState::DoingInitialLogin || InitializationState == ECommonUserInitializationState::DoingNetworkLogin);
+}
+
+ECommonUserPrivilegeResult UCommonUserInfo::GetCachedPrivilegeResult(ECommonUserPrivilege Privilege, ECommonUserOnlineContext Context) const
+{
+	const FCachedData* FoundCached = GetCachedData(Context);
+
+	if (FoundCached)
+	{
+		const ECommonUserPrivilegeResult* FoundResult = FoundCached->CachedPrivileges.Find(Privilege);
+		if (FoundResult)
+		{
+			return *FoundResult;
+		}
+	}
+	return ECommonUserPrivilegeResult::Unknown;
+}
+
+ECommonUserAvailability UCommonUserInfo::GetPrivilegeAvailability(ECommonUserPrivilege Privilege) const
+{
+	// Bad feature or user
+	if ((int32)Privilege < 0 || (int32)Privilege >= (int32)ECommonUserPrivilege::Invalid_Count || InitializationState == ECommonUserInitializationState::Invalid)
+	{
+		return ECommonUserAvailability::Invalid;
+	}
+
+	ECommonUserPrivilegeResult CachedResult = GetCachedPrivilegeResult(Privilege, ECommonUserOnlineContext::Game);
+
+	// First handle explicit failures
+	switch (CachedResult)
+	{
+	case ECommonUserPrivilegeResult::LicenseInvalid:
+	case ECommonUserPrivilegeResult::VersionOutdated:
+	case ECommonUserPrivilegeResult::AgeRestricted:
+		return ECommonUserAvailability::AlwaysUnavailable;
+
+	case ECommonUserPrivilegeResult::NetworkConnectionUnavailable:
+	case ECommonUserPrivilegeResult::AccountTypeRestricted:
+	case ECommonUserPrivilegeResult::AccountUseRestricted:
+	case ECommonUserPrivilegeResult::PlatformFailure:
+		return ECommonUserAvailability::CurrentlyUnavailable;
+
+	default:
+		break;
+	}
+
+	if (bIsGuest)
+	{
+		// Guests can only play, cannot use online features
+		if (Privilege == ECommonUserPrivilege::CanPlay)
+		{
+			return ECommonUserAvailability::NowAvailable;
+		}
+		else
+		{
+			return ECommonUserAvailability::AlwaysUnavailable;
+		}
+	}
+
+	// Check network status
+	if (Privilege == ECommonUserPrivilege::CanPlayOnline ||
+		Privilege == ECommonUserPrivilege::CanUseCrossPlay ||
+		Privilege == ECommonUserPrivilege::CanCommunicateViaTextOnline ||
+		Privilege == ECommonUserPrivilege::CanCommunicateViaVoiceOnline)
+	{
+		UCommonUserSubsystem* Subsystem = GetSubsystem();
+		if (ensure(Subsystem) && !Subsystem->HasOnlineConnection(ECommonUserOnlineContext::Game))
+		{
+			return ECommonUserAvailability::CurrentlyUnavailable;
+		}
+	}
+
+	if (InitializationState == ECommonUserInitializationState::FailedtoLogin)
+	{
+		// Failed a prior login attempt
+		return ECommonUserAvailability::CurrentlyUnavailable;
+	}
+	else if (InitializationState == ECommonUserInitializationState::Unknown || InitializationState == ECommonUserInitializationState::DoingInitialLogin)
+	{
+		// Haven't logged in yet
+		return ECommonUserAvailability::PossiblyAvailable;
+	}
+	else if (InitializationState == ECommonUserInitializationState::LoggedInLocalOnly || InitializationState == ECommonUserInitializationState::DoingNetworkLogin)
+	{
+		// Local login succeeded so play checks are valid
+		if (Privilege == ECommonUserPrivilege::CanPlay && CachedResult == ECommonUserPrivilegeResult::Available)
+		{
+			return ECommonUserAvailability::NowAvailable;
+		}
+
+		// Haven't logged in online yet
+		return ECommonUserAvailability::PossiblyAvailable;
+	}
+	else if (InitializationState == ECommonUserInitializationState::LoggedInOnline)
+	{
+		// Fully logged in
+		if (CachedResult == ECommonUserPrivilegeResult::Available)
+		{
+			return ECommonUserAvailability::NowAvailable;
+		}
+
+		// Failed for other reason
+		return ECommonUserAvailability::CurrentlyUnavailable;
+	}
+
+	return ECommonUserAvailability::Unknown;
+}
+
+FUniqueNetIdRepl UCommonUserInfo::GetNetId(ECommonUserOnlineContext Context) const
+{
+	const FCachedData* FoundCached = GetCachedData(Context);
+
+	if (FoundCached)
+	{
+		return FoundCached->CachedNetId;
+	}
+
+	return FUniqueNetIdRepl();
+}
+
+FString UCommonUserInfo::GetNickname(ECommonUserOnlineContext Context) const
+{
+	const FCachedData* FoundCached = GetCachedData(Context);
+
+	if (FoundCached)
+	{
+		return FoundCached->CachedNickname;
+	}
+
+	// TODO maybe return unknown user here?
+	return FString();
+}
+
+void UCommonUserInfo::SetNickname(const FString& NewNickname, ECommonUserOnlineContext Context)
+{
+	FCachedData* ContextCache = GetCachedData(Context);
+
+	if (ensure(ContextCache))
+	{
+		ContextCache->CachedNickname = NewNickname;
+	}
+}
+
+FString UCommonUserInfo::GetDebugString() const
+{
+	FUniqueNetIdRepl NetId = GetNetId();
+	return NetId.ToDebugString();
+}
+
+FPlatformUserId UCommonUserInfo::GetPlatformUserId() const
+{
+	return PlatformUser;
+}
+
+int32 UCommonUserInfo::GetPlatformUserIndex() const
+{
+	// Convert our platform id to index
+	const UCommonUserSubsystem* Subsystem = GetSubsystem();
+
+	if (ensure(Subsystem))
+	{
+		return Subsystem->GetPlatformUserIndexForId(PlatformUser);
+	}
+
+	return INDEX_NONE;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// UCommonUserSubsystem
+
+void UCommonUserSubsystem::Initialize(FSubsystemCollectionBase& Collection)
+{
+	Super::Initialize(Collection);
+
+	// Create our OSS wrappers
+	CreateOnlineContexts();
+
+	BindOnlineDelegates();
+	
+	IPlatformInputDeviceMapper& DeviceMapper = IPlatformInputDeviceMapper::Get();
+	DeviceMapper.GetOnInputDeviceConnectionChange().AddUObject(this, &ThisClass::HandleInputDeviceConnectionChanged);
+
+	// Matches the engine default
+	SetMaxLocalPlayers(4);
+
+	ResetUserState();
+
+	UGameInstance* GameInstance = GetGameInstance();
+	bIsDedicatedServer = GameInstance->IsDedicatedServerInstance();
+}
+
+void UCommonUserSubsystem::CreateOnlineContexts()
+{
+	// First initialize default
+	DefaultContextInternal = new FOnlineContextCache();
+#if COMMONUSER_OSSV1
+	DefaultContextInternal->OnlineSubsystem = Online::GetSubsystem(GetWorld());
+	check(DefaultContextInternal->OnlineSubsystem);
+	DefaultContextInternal->IdentityInterface = DefaultContextInternal->OnlineSubsystem->GetIdentityInterface();
+	check(DefaultContextInternal->IdentityInterface.IsValid());
+
+	IOnlineSubsystem* PlatformSub = IOnlineSubsystem::GetByPlatform();
+
+	if (PlatformSub && DefaultContextInternal->OnlineSubsystem != PlatformSub)
+	{
+		// Set up the optional platform service if it exists
+		PlatformContextInternal = new FOnlineContextCache();
+		PlatformContextInternal->OnlineSubsystem = PlatformSub;
+		PlatformContextInternal->IdentityInterface = PlatformSub->GetIdentityInterface();
+		check(PlatformContextInternal->IdentityInterface.IsValid());
+	}
+#else
+	DefaultContextInternal->OnlineServices = GetServices(GetWorld(), EOnlineServices::Default);
+	check(DefaultContextInternal->OnlineServices);
+	DefaultContextInternal->AuthService = DefaultContextInternal->OnlineServices->GetAuthInterface();
+	check(DefaultContextInternal->AuthService);
+
+	UE::Online::IOnlineServicesPtr PlatformServices = GetServices(GetWorld(), EOnlineServices::Platform);
+	if (PlatformServices && DefaultContextInternal->OnlineServices != PlatformServices)
+	{
+		PlatformContextInternal = new FOnlineContextCache();
+		PlatformContextInternal->OnlineServices = PlatformServices;
+		PlatformContextInternal->AuthService = PlatformContextInternal->OnlineServices->GetAuthInterface();
+		check(PlatformContextInternal->AuthService);
+	}
+#endif
+
+	// Explicit external services can be set up after if needed
+}
+
+void UCommonUserSubsystem::Deinitialize()
+{
+	DestroyOnlineContexts();
+
+	IPlatformInputDeviceMapper& DeviceMapper = IPlatformInputDeviceMapper::Get();
+	DeviceMapper.GetOnInputDeviceConnectionChange().RemoveAll(this);
+
+	LocalUserInfos.Reset();
+	ActiveLoginRequests.Reset();
+
+	Super::Deinitialize();
+}
+
+void UCommonUserSubsystem::DestroyOnlineContexts()
+{
+	// All cached shared ptrs must be cleared here
+	if (ServiceContextInternal && ServiceContextInternal != DefaultContextInternal)
+	{
+		delete ServiceContextInternal;
+	}
+	if (PlatformContextInternal && PlatformContextInternal != DefaultContextInternal)
+	{
+		delete PlatformContextInternal;
+	}
+	if (DefaultContextInternal)
+	{
+		delete DefaultContextInternal;
+	}
+
+	ServiceContextInternal = PlatformContextInternal = DefaultContextInternal = nullptr;
+}
+
+UCommonUserInfo* UCommonUserSubsystem::CreateLocalUserInfo(int32 LocalPlayerIndex)
+{
+	UCommonUserInfo* NewUser = nullptr;
+	if (ensure(!LocalUserInfos.Contains(LocalPlayerIndex)))
+	{
+		NewUser = NewObject<UCommonUserInfo>(this);
+		NewUser->LocalPlayerIndex = LocalPlayerIndex;
+		NewUser->InitializationState = ECommonUserInitializationState::Unknown;
+
+		// Always create game and default cache
+		NewUser->CachedDataMap.Add(ECommonUserOnlineContext::Game, UCommonUserInfo::FCachedData());
+		NewUser->CachedDataMap.Add(ECommonUserOnlineContext::Default, UCommonUserInfo::FCachedData());
+
+		// Add platform if needed
+		if (HasSeparatePlatformContext())
+		{
+			NewUser->CachedDataMap.Add(ECommonUserOnlineContext::Platform, UCommonUserInfo::FCachedData());
+		}
+
+		LocalUserInfos.Add(LocalPlayerIndex, NewUser);
+	}
+	return NewUser;
+}
+
+bool UCommonUserSubsystem::ShouldCreateSubsystem(UObject* Outer) const
+{
+	TArray<UClass*> ChildClasses;
+	GetDerivedClasses(GetClass(), ChildClasses, false);
+
+	// Only create an instance if there is not a game-specific subclass
+	return ChildClasses.Num() == 0;
+}
+
+void UCommonUserSubsystem::BindOnlineDelegates()
+{
+#if COMMONUSER_OSSV1
+	return BindOnlineDelegatesOSSv1();
+#else
+	return BindOnlineDelegatesOSSv2();
+#endif
+}
+
+void UCommonUserSubsystem::LogOutLocalUser(FPlatformUserId PlatformUser)
+{
+	UCommonUserInfo* UserInfo = ModifyInfo(GetUserInfoForPlatformUser(PlatformUser));
+
+	// Don't need to do anything if the user has never logged in fully or is in the process of logging in
+	if (UserInfo && (UserInfo->InitializationState == ECommonUserInitializationState::LoggedInLocalOnly || UserInfo->InitializationState == ECommonUserInitializationState::LoggedInOnline))
+	{
+		ECommonUserAvailability OldAvailablity = UserInfo->GetPrivilegeAvailability(ECommonUserPrivilege::CanPlay);
+
+		UserInfo->InitializationState = ECommonUserInitializationState::FailedtoLogin;
+
+		// This will broadcast the game delegate
+		HandleChangedAvailability(UserInfo, ECommonUserPrivilege::CanPlay, OldAvailablity);
+	}
+}
+
+bool UCommonUserSubsystem::TransferPlatformAuth(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+#if COMMONUSER_OSSV1
+	// Not supported in V1 path
+	return false;
+#else
+	return TransferPlatformAuthOSSv2(System, Request, PlatformUser);
+#endif
+}
+
+bool UCommonUserSubsystem::AutoLogin(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("Player AutoLogin requested - UserIdx:%d, Privilege:%d, Context:%d"),
+		PlatformUser.GetInternalId(),
+		(int32)Request->DesiredPrivilege,
+		(int32)Request->DesiredContext);
+
+#if COMMONUSER_OSSV1
+	return AutoLoginOSSv1(System, Request, PlatformUser);
+#else
+	return AutoLoginOSSv2(System, Request, PlatformUser);
+#endif
+}
+
+bool UCommonUserSubsystem::ShowLoginUI(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("Player LoginUI requested - UserIdx:%d, Privilege:%d, Context:%d"),
+		PlatformUser.GetInternalId(),
+		(int32)Request->DesiredPrivilege,
+		(int32)Request->DesiredContext);
+
+#if COMMONUSER_OSSV1
+	return ShowLoginUIOSSv1(System, Request, PlatformUser);
+#else
+	return ShowLoginUIOSSv2(System, Request, PlatformUser);
+#endif
+}
+
+bool UCommonUserSubsystem::QueryUserPrivilege(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+#if COMMONUSER_OSSV1
+	return QueryUserPrivilegeOSSv1(System, Request, PlatformUser);
+#else
+	return QueryUserPrivilegeOSSv2(System, Request, PlatformUser);
+#endif
+}
+
+
+#if COMMONUSER_OSSV1
+IOnlineSubsystem* UCommonUserSubsystem::GetOnlineSubsystem(ECommonUserOnlineContext Context) const
+{
+	const FOnlineContextCache* System = GetContextCache(Context);
+
+	if (System)
+	{
+		return System->OnlineSubsystem;
+	}
+
+	return nullptr;
+}
+
+IOnlineIdentity* UCommonUserSubsystem::GetOnlineIdentity(ECommonUserOnlineContext Context) const
+{
+	const FOnlineContextCache* System = GetContextCache(Context);
+	if (System)
+	{
+		return System->IdentityInterface.Get();
+	}
+
+	return nullptr;
+}
+
+FName UCommonUserSubsystem::GetOnlineSubsystemName(ECommonUserOnlineContext Context) const
+{
+	IOnlineSubsystem* SubSystem = GetOnlineSubsystem(Context);
+	if (SubSystem)
+	{
+		return SubSystem->GetSubsystemName();
+	}
+
+	return NAME_None;
+}
+
+EOnlineServerConnectionStatus::Type UCommonUserSubsystem::GetConnectionStatus(ECommonUserOnlineContext Context) const
+{
+	const FOnlineContextCache* System = GetContextCache(Context);
+	if (System)
+	{
+		return System->CurrentConnectionStatus;
+	}
+
+	return EOnlineServerConnectionStatus::ServiceUnavailable;
+}
+
+void UCommonUserSubsystem::BindOnlineDelegatesOSSv1()
+{
+	ECommonUserOnlineContext ServiceType = ResolveOnlineContext(ECommonUserOnlineContext::ServiceOrDefault);
+	ECommonUserOnlineContext PlatformType = ResolveOnlineContext(ECommonUserOnlineContext::PlatformOrDefault);
+	FOnlineContextCache* ServiceContext = GetContextCache(ServiceType);
+	FOnlineContextCache* PlatformContext = GetContextCache(PlatformType);
+	check(ServiceContext && ServiceContext->OnlineSubsystem && PlatformContext && PlatformContext->OnlineSubsystem);
+	// Connection delegates need to listen for both systems
+
+	ServiceContext->OnlineSubsystem->AddOnConnectionStatusChangedDelegate_Handle(FOnConnectionStatusChangedDelegate::CreateUObject(this, &ThisClass::HandleNetworkConnectionStatusChanged, ServiceType));
+	ServiceContext->CurrentConnectionStatus = EOnlineServerConnectionStatus::Normal;
+
+	for (int32 PlayerIdx = 0; PlayerIdx < MAX_LOCAL_PLAYERS; PlayerIdx++)
+	{
+		ServiceContext->IdentityInterface->AddOnLoginStatusChangedDelegate_Handle(PlayerIdx, FOnLoginStatusChangedDelegate::CreateUObject(this, &ThisClass::HandleIdentityLoginStatusChanged, ServiceType));
+		ServiceContext->IdentityInterface->AddOnLoginCompleteDelegate_Handle(PlayerIdx, FOnLoginCompleteDelegate::CreateUObject(this, &ThisClass::HandleUserLoginCompleted, ServiceType));
+	}
+
+	if (ServiceType != PlatformType)
+	{
+		PlatformContext->OnlineSubsystem->AddOnConnectionStatusChangedDelegate_Handle(FOnConnectionStatusChangedDelegate::CreateUObject(this, &ThisClass::HandleNetworkConnectionStatusChanged, PlatformType));
+		PlatformContext->CurrentConnectionStatus = EOnlineServerConnectionStatus::Normal;
+
+		for (int32 PlayerIdx = 0; PlayerIdx < MAX_LOCAL_PLAYERS; PlayerIdx++)
+		{
+			PlatformContext->IdentityInterface->AddOnLoginStatusChangedDelegate_Handle(PlayerIdx, FOnLoginStatusChangedDelegate::CreateUObject(this, &ThisClass::HandleIdentityLoginStatusChanged, PlatformType));
+			PlatformContext->IdentityInterface->AddOnLoginCompleteDelegate_Handle(PlayerIdx, FOnLoginCompleteDelegate::CreateUObject(this, &ThisClass::HandleUserLoginCompleted, PlatformType));
+		}
+	}
+
+	// Hardware change delegates only listen to platform
+	PlatformContext->IdentityInterface->AddOnControllerPairingChangedDelegate_Handle(FOnControllerPairingChangedDelegate::CreateUObject(this, &ThisClass::HandleControllerPairingChanged));
+}
+
+bool UCommonUserSubsystem::AutoLoginOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	return System->IdentityInterface->AutoLogin(GetPlatformUserIndexForId(PlatformUser));
+}
+
+bool UCommonUserSubsystem::ShowLoginUIOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	IOnlineExternalUIPtr ExternalUI = System->OnlineSubsystem->GetExternalUIInterface();
+	if (ExternalUI.IsValid())
+	{
+		// TODO Unclear which flags should be set
+		return ExternalUI->ShowLoginUI(GetPlatformUserIndexForId(PlatformUser), false, false, FOnLoginUIClosedDelegate::CreateUObject(this, &ThisClass::HandleOnLoginUIClosed, Request->CurrentContext));
+	}
+	return false;
+}
+
+bool UCommonUserSubsystem::QueryUserPrivilegeOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	// Start query on unknown or failure
+	EUserPrivileges::Type OSSPrivilege = ConvertOSSPrivilege(Request->DesiredPrivilege);
+
+	FUniqueNetIdRepl CurrentId = GetLocalUserNetId(PlatformUser, Request->CurrentContext);
+	check(CurrentId.IsValid());
+	IOnlineIdentity::FOnGetUserPrivilegeCompleteDelegate Delegate = IOnlineIdentity::FOnGetUserPrivilegeCompleteDelegate::CreateUObject(this, &UCommonUserSubsystem::HandleCheckPrivilegesComplete, Request->DesiredPrivilege, Request->UserInfo, Request->CurrentContext);
+	System->IdentityInterface->GetUserPrivilege(*CurrentId, OSSPrivilege, Delegate);
+
+	// This may immediately succeed and reenter this function, so we have to return
+	return true;
+}
+
+#else
+
+UE::Online::EOnlineServices UCommonUserSubsystem::GetOnlineServicesProvider(ECommonUserOnlineContext Context) const
+{
+	if (const FOnlineContextCache* System = GetContextCache(Context))
+	{
+		return System->OnlineServices->GetServicesProvider();
+	}
+	return UE::Online::EOnlineServices::None;
+}
+
+UE::Online::IAuthPtr UCommonUserSubsystem::GetOnlineAuth(ECommonUserOnlineContext Context) const
+{
+	if (const FOnlineContextCache* System = GetContextCache(Context))
+	{
+		return System->AuthService;
+	}
+	return nullptr;
+}
+
+UE::Online::EOnlineServicesConnectionStatus UCommonUserSubsystem::GetConnectionStatus(ECommonUserOnlineContext Context) const
+{
+	if (const FOnlineContextCache* System = GetContextCache(Context))
+	{
+		return System->CurrentConnectionStatus;
+	}
+	return UE::Online::EOnlineServicesConnectionStatus::NotConnected;
+}
+
+void UCommonUserSubsystem::BindOnlineDelegatesOSSv2()
+{
+	ECommonUserOnlineContext ServiceType = ResolveOnlineContext(ECommonUserOnlineContext::ServiceOrDefault);
+	ECommonUserOnlineContext PlatformType = ResolveOnlineContext(ECommonUserOnlineContext::PlatformOrDefault);
+	FOnlineContextCache* ServiceContext = GetContextCache(ServiceType);
+	FOnlineContextCache* PlatformContext = GetContextCache(PlatformType);
+	check(ServiceContext && ServiceContext->OnlineServices && PlatformContext && PlatformContext->OnlineServices);
+
+	ServiceContext->LoginStatusChangedHandle = ServiceContext->AuthService->OnLoginStatusChanged().Add(this, &ThisClass::HandleAuthLoginStatusChanged, ServiceType);
+	if (IConnectivityPtr ConnectivityInterface = ServiceContext->OnlineServices->GetConnectivityInterface())
+	{
+		ServiceContext->ConnectionStatusChangedHandle = ConnectivityInterface->OnConnectionStatusChanged().Add(this, &ThisClass::HandleNetworkConnectionStatusChanged, ServiceType);
+	}
+	CacheConnectionStatus(ServiceType);
+
+	if (ServiceType != PlatformType)
+	{
+		PlatformContext->LoginStatusChangedHandle = PlatformContext->AuthService->OnLoginStatusChanged().Add(this, &ThisClass::HandleAuthLoginStatusChanged, PlatformType);
+		if (IConnectivityPtr ConnectivityInterface = PlatformContext->OnlineServices->GetConnectivityInterface())
+		{
+			PlatformContext->ConnectionStatusChangedHandle = ConnectivityInterface->OnConnectionStatusChanged().Add(this, &ThisClass::HandleNetworkConnectionStatusChanged, PlatformType);
+		}
+		CacheConnectionStatus(PlatformType);
+	}
+	// TODO:  Controller Pairing Changed - move out of OSS and listen to CoreDelegate directly?
+}
+
+void UCommonUserSubsystem::CacheConnectionStatus(ECommonUserOnlineContext Context)
+{
+	FOnlineContextCache* ContextCache = GetContextCache(Context);
+	check(ContextCache);
+
+	EOnlineServicesConnectionStatus ConnectionStatus = EOnlineServicesConnectionStatus::NotConnected;
+	if (IConnectivityPtr ConnectivityInterface = ContextCache->OnlineServices->GetConnectivityInterface())
+	{
+		const TOnlineResult<FGetConnectionStatus> Result = ConnectivityInterface->GetConnectionStatus(FGetConnectionStatus::Params());
+		if (Result.IsOk())
+		{
+			ConnectionStatus = Result.GetOkValue().Status;
+		}
+	}
+	else
+	{
+		ConnectionStatus = EOnlineServicesConnectionStatus::Connected;
+	}
+
+	UE::Online::FConnectionStatusChanged EventParams;
+	EventParams.PreviousStatus = ContextCache->CurrentConnectionStatus;
+	EventParams.CurrentStatus = ConnectionStatus;
+	HandleNetworkConnectionStatusChanged(EventParams, Context);
+}
+
+bool UCommonUserSubsystem::TransferPlatformAuthOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	IAuthPtr PlatformAuthInterface = GetOnlineAuth(ECommonUserOnlineContext::Platform);
+	if (Request->CurrentContext != ECommonUserOnlineContext::Platform
+		&& PlatformAuthInterface)
+	{
+		FAuthQueryExternalAuthToken::Params Params;
+		Params.LocalAccountId = GetLocalUserNetId(PlatformUser, ECommonUserOnlineContext::Platform).GetV2();
+
+		PlatformAuthInterface->QueryExternalAuthToken(MoveTemp(Params))
+		.OnComplete(this, [this, Request](const TOnlineResult<FAuthQueryExternalAuthToken>& Result)
+		{
+			UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+			if (!UserInfo)
+			{
+				// User is gone, just delete this request
+				ActiveLoginRequests.Remove(Request);
+				return;
+			}
+
+			if (Result.IsOk())
+			{
+				const FAuthQueryExternalAuthToken::Result& GenerateAuthTokenResult = Result.GetOkValue();
+				FAuthLogin::Params Params;
+				Params.PlatformUserId = UserInfo->GetPlatformUserId();
+				Params.CredentialsType = LoginCredentialsType::ExternalAuth;
+				Params.CredentialsToken.Emplace<FExternalAuthToken>(GenerateAuthTokenResult.ExternalAuthToken);
+
+				IAuthPtr PrimaryAuthInterface = GetOnlineAuth(Request->CurrentContext);
+				PrimaryAuthInterface->Login(MoveTemp(Params))
+				.OnComplete(this, [this, Request](const TOnlineResult<FAuthLogin>& Result)
+				{
+					UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+					if (!UserInfo)
+					{
+						// User is gone, just delete this request
+						ActiveLoginRequests.Remove(Request);
+						return;
+					}
+
+					if (Result.IsOk())
+					{
+						Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::Done;
+						Request->Error.Reset();
+					}
+					else
+					{
+						Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::Failed;
+						Request->Error = Result.GetErrorValue();
+					}
+					ProcessLoginRequest(Request);
+				});
+			}
+			else
+			{
+				Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::Failed;
+				Request->Error = Result.GetErrorValue();
+				ProcessLoginRequest(Request);
+			}
+		});
+		return true;
+	}
+	return false;
+}
+
+bool UCommonUserSubsystem::AutoLoginOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	FAuthLogin::Params LoginParameters;
+	LoginParameters.PlatformUserId = PlatformUser;
+	LoginParameters.CredentialsType = LoginCredentialsType::Auto;
+	// Leave other LoginParameters as default to allow the online service to determine how to try to automatically log in the user
+	TOnlineAsyncOpHandle<FAuthLogin> LoginHandle = System->AuthService->Login(MoveTemp(LoginParameters));
+	LoginHandle.OnComplete(this, &ThisClass::HandleUserLoginCompletedV2, PlatformUser, Request->CurrentContext);
+	return true;
+}
+
+bool UCommonUserSubsystem::ShowLoginUIOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	IExternalUIPtr ExternalUI = System->OnlineServices->GetExternalUIInterface();
+	if (ExternalUI.IsValid())
+	{
+		FExternalUIShowLoginUI::Params ShowLoginUIParameters;
+		ShowLoginUIParameters.PlatformUserId = PlatformUser;
+		TOnlineAsyncOpHandle<FExternalUIShowLoginUI> LoginHandle = ExternalUI->ShowLoginUI(MoveTemp(ShowLoginUIParameters));
+		LoginHandle.OnComplete(this, &ThisClass::HandleOnLoginUIClosedV2, PlatformUser, Request->CurrentContext);
+		return true;
+	}
+	return false;
+}
+
+bool UCommonUserSubsystem::QueryUserPrivilegeOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser)
+{
+	UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+	if (IPrivilegesPtr PrivilegesInterface = System->OnlineServices->GetPrivilegesInterface())
+	{
+		const EUserPrivileges DesiredPrivilege = ConvertOnlineServicesPrivilege(Request->DesiredPrivilege);
+
+		FQueryUserPrivilege::Params Params;
+		Params.LocalAccountId = GetLocalUserNetId(PlatformUser, Request->CurrentContext).GetV2();
+		Params.Privilege = DesiredPrivilege;
+		TOnlineAsyncOpHandle<FQueryUserPrivilege> QueryHandle = PrivilegesInterface->QueryUserPrivilege(MoveTemp(Params));
+		QueryHandle.OnComplete(this, &ThisClass::HandleCheckPrivilegesComplete, Request->UserInfo, DesiredPrivilege, Request->CurrentContext);
+		return true;
+	}
+	else
+	{
+		UpdateUserPrivilegeResult(UserInfo, Request->DesiredPrivilege, ECommonUserPrivilegeResult::Available, Request->CurrentContext);
+	}
+	return false;
+}
+
+TSharedPtr<FAccountInfo> UCommonUserSubsystem::GetOnlineServiceAccountInfo(IAuthPtr AuthService, FPlatformUserId InUserId) const
+{
+	TSharedPtr<FAccountInfo> AccountInfo;
+	FAuthGetLocalOnlineUserByPlatformUserId::Params GetAccountParams = { InUserId };
+	TOnlineResult<FAuthGetLocalOnlineUserByPlatformUserId> GetAccountResult = AuthService->GetLocalOnlineUserByPlatformUserId(MoveTemp(GetAccountParams));
+	if (GetAccountResult.IsOk())
+	{
+		AccountInfo = GetAccountResult.GetOkValue().AccountInfo;
+	}
+	return AccountInfo;
+}
+
+#endif
+
+bool UCommonUserSubsystem::HasOnlineConnection(ECommonUserOnlineContext Context) const
+{
+#if COMMONUSER_OSSV1
+	EOnlineServerConnectionStatus::Type ConnectionType = GetConnectionStatus(Context);
+
+	if (ConnectionType == EOnlineServerConnectionStatus::Normal || ConnectionType == EOnlineServerConnectionStatus::Connected)
+	{
+		return true;
+	}
+
+	return false;
+#else
+	return GetConnectionStatus(Context) == UE::Online::EOnlineServicesConnectionStatus::Connected;
+#endif
+}
+
+ELoginStatusType UCommonUserSubsystem::GetLocalUserLoginStatus(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context) const
+{
+	if (!IsRealPlatformUser(PlatformUser))
+	{
+		return ELoginStatusType::NotLoggedIn;
+	}
+
+	const FOnlineContextCache* System = GetContextCache(Context);
+	if (System)
+	{
+#if COMMONUSER_OSSV1
+		return System->IdentityInterface->GetLoginStatus(GetPlatformUserIndexForId(PlatformUser));
+#else
+		if (TSharedPtr<FAccountInfo> AccountInfo = GetOnlineServiceAccountInfo(System->AuthService, PlatformUser))
+		{
+			return AccountInfo->LoginStatus;
+		}
+#endif
+	}
+	return ELoginStatusType::NotLoggedIn;
+}
+
+FUniqueNetIdRepl UCommonUserSubsystem::GetLocalUserNetId(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context) const
+{
+	if (!IsRealPlatformUser(PlatformUser))
+	{
+		return FUniqueNetIdRepl();
+	}
+
+	const FOnlineContextCache* System = GetContextCache(Context);
+	if (System)
+	{
+#if COMMONUSER_OSSV1
+		return FUniqueNetIdRepl(System->IdentityInterface->GetUniquePlayerId(GetPlatformUserIndexForId(PlatformUser)));
+#else
+		// TODO:  OSSv2 FUniqueNetIdRepl wrapping FAccountId is in progress
+		if (TSharedPtr<FAccountInfo> AccountInfo = GetOnlineServiceAccountInfo(System->AuthService, PlatformUser))
+		{
+			return FUniqueNetIdRepl(AccountInfo->AccountId);
+		}
+#endif
+	}
+
+	return FUniqueNetIdRepl();
+}
+
+FString UCommonUserSubsystem::GetLocalUserNickname(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context) const
+{
+#if COMMONUSER_OSSV1
+	IOnlineIdentity* Identity = GetOnlineIdentity(Context);
+	if (ensure(Identity))
+	{
+		return Identity->GetPlayerNickname(GetPlatformUserIndexForId(PlatformUser));
+	}
+#else
+	if (IAuthPtr AuthService = GetOnlineAuth(Context))
+	{
+		if (TSharedPtr<FAccountInfo> AccountInfo = GetOnlineServiceAccountInfo(AuthService, PlatformUser))
+		{
+			if (const FSchemaVariant* DisplayName = AccountInfo->Attributes.Find(AccountAttributeData::DisplayName))
+			{
+				return DisplayName->GetString();
+			}
+		}
+	}
+#endif // COMMONUSER_OSSV1
+
+	return FString();
+}
+
+void UCommonUserSubsystem::SendSystemMessage(FGameplayTag MessageType, FText TitleText, FText BodyText)
+{
+	OnHandleSystemMessage.Broadcast(MessageType, TitleText, BodyText);
+}
+
+void UCommonUserSubsystem::SetMaxLocalPlayers(int32 InMaxLocalPlayers)
+{
+	if (ensure(InMaxLocalPlayers >= 1))
+	{
+		// We can have more local players than MAX_LOCAL_PLAYERS, the rest are treated as guests
+		MaxNumberOfLocalPlayers = InMaxLocalPlayers;
+
+		UGameInstance* GameInstance = GetGameInstance();
+		UGameViewportClient* ViewportClient = GameInstance ? GameInstance->GetGameViewportClient() : nullptr;
+
+		if (ViewportClient)
+		{
+			ViewportClient->MaxSplitscreenPlayers = MaxNumberOfLocalPlayers;
+		}
+	}
+}
+
+int32 UCommonUserSubsystem::GetMaxLocalPlayers() const
+{
+	return MaxNumberOfLocalPlayers;
+}
+
+int32 UCommonUserSubsystem::GetNumLocalPlayers() const
+{
+	UGameInstance* GameInstance = GetGameInstance();
+	if (ensure(GameInstance))
+	{
+		return GameInstance->GetNumLocalPlayers();
+	}
+	return 1;
+}
+
+ECommonUserInitializationState UCommonUserSubsystem::GetLocalPlayerInitializationState(int32 LocalPlayerIndex) const
+{
+	const UCommonUserInfo* UserInfo = GetUserInfoForLocalPlayerIndex(LocalPlayerIndex);
+	if (UserInfo)
+	{
+		return UserInfo->InitializationState;
+	}
+
+	if (LocalPlayerIndex < 0 || LocalPlayerIndex >= GetMaxLocalPlayers())
+	{
+		return ECommonUserInitializationState::Invalid;
+	}
+
+	return ECommonUserInitializationState::Unknown;
+}
+
+bool UCommonUserSubsystem::TryToInitializeForLocalPlay(int32 LocalPlayerIndex, FInputDeviceId PrimaryInputDevice, bool bCanUseGuestLogin)
+{
+	if (!PrimaryInputDevice.IsValid())
+	{
+		// Set to default device
+		PrimaryInputDevice = IPlatformInputDeviceMapper::Get().GetDefaultInputDevice();
+	}
+
+	FCommonUserInitializeParams Params;
+	Params.LocalPlayerIndex = LocalPlayerIndex;
+	Params.PrimaryInputDevice = PrimaryInputDevice;
+	Params.bCanUseGuestLogin = bCanUseGuestLogin;
+	Params.bCanCreateNewLocalPlayer = true;
+	Params.RequestedPrivilege = ECommonUserPrivilege::CanPlay;
+
+	return TryToInitializeUser(Params);
+}
+
+bool UCommonUserSubsystem::TryToLoginForOnlinePlay(int32 LocalPlayerIndex)
+{
+	FCommonUserInitializeParams Params;
+	Params.LocalPlayerIndex = LocalPlayerIndex;
+	Params.bCanCreateNewLocalPlayer = false;
+	Params.RequestedPrivilege = ECommonUserPrivilege::CanPlayOnline;
+
+	return TryToInitializeUser(Params);
+}
+
+bool UCommonUserSubsystem::TryToInitializeUser(FCommonUserInitializeParams Params)
+{
+	if (Params.LocalPlayerIndex < 0 || (!Params.bCanCreateNewLocalPlayer && Params.LocalPlayerIndex >= GetNumLocalPlayers()))
+	{
+		if (!bIsDedicatedServer)
+		{
+			UE_LOG(LogCommonUser, Error, TEXT("TryToInitializeUser %d failed with current %d and max %d, invalid index"), 
+				Params.LocalPlayerIndex, GetNumLocalPlayers(), GetMaxLocalPlayers());
+			return false;
+		}
+	}
+
+	if (Params.LocalPlayerIndex > GetNumLocalPlayers() || Params.LocalPlayerIndex >= GetMaxLocalPlayers())
+	{
+		UE_LOG(LogCommonUser, Error, TEXT("TryToInitializeUser %d failed with current %d and max %d, can only create in order up to max players"), 
+			Params.LocalPlayerIndex, GetNumLocalPlayers(), GetMaxLocalPlayers());
+		return false;
+	}
+
+	// Fill in platform user and input device if needed
+	if (Params.ControllerId != INDEX_NONE && (!Params.PrimaryInputDevice.IsValid() || !Params.PlatformUser.IsValid()))
+	{
+		IPlatformInputDeviceMapper::Get().RemapControllerIdToPlatformUserAndDevice(Params.ControllerId, Params.PlatformUser, Params.PrimaryInputDevice);
+	}
+
+	if (Params.PrimaryInputDevice.IsValid() && !Params.PlatformUser.IsValid())
+	{
+		Params.PlatformUser = GetPlatformUserIdForInputDevice(Params.PrimaryInputDevice);
+	}
+	else if (Params.PlatformUser.IsValid() && !Params.PrimaryInputDevice.IsValid())
+	{
+		Params.PrimaryInputDevice = GetPrimaryInputDeviceForPlatformUser(Params.PlatformUser);
+	}
+
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(Params.LocalPlayerIndex));
+	UCommonUserInfo* LocalUserInfoForController = ModifyInfo(GetUserInfoForInputDevice(Params.PrimaryInputDevice));
+
+	if (LocalUserInfoForController && LocalUserInfo && LocalUserInfoForController != LocalUserInfo)
+	{
+		UE_LOG(LogCommonUser, Error, TEXT("TryToInitializeUser %d failed because controller %d is already assigned to player %d"),
+			Params.LocalPlayerIndex, Params.PrimaryInputDevice.GetId(), LocalUserInfoForController->LocalPlayerIndex);
+		return false;
+	}
+
+	if (Params.LocalPlayerIndex == 0 && Params.bCanUseGuestLogin)
+	{
+		UE_LOG(LogCommonUser, Error, TEXT("TryToInitializeUser failed because player 0 cannot be a guest"));
+		return false;
+	}
+
+	if (!LocalUserInfo)
+	{
+		LocalUserInfo = CreateLocalUserInfo(Params.LocalPlayerIndex);
+	}
+	else
+	{
+		// Copy from existing user info
+		if (!Params.PrimaryInputDevice.IsValid())
+		{
+			Params.PrimaryInputDevice = LocalUserInfo->PrimaryInputDevice;
+		}
+
+		if (!Params.PlatformUser.IsValid())
+		{
+			Params.PlatformUser = LocalUserInfo->PlatformUser;
+		}
+	}
+	
+	if (LocalUserInfo->InitializationState != ECommonUserInitializationState::Unknown && LocalUserInfo->InitializationState != ECommonUserInitializationState::FailedtoLogin)
+	{
+		// Not allowed to change parameters during login
+		if (LocalUserInfo->PrimaryInputDevice != Params.PrimaryInputDevice || LocalUserInfo->PlatformUser != Params.PlatformUser || LocalUserInfo->bCanBeGuest != Params.bCanUseGuestLogin)
+		{
+			UE_LOG(LogCommonUser, Error, TEXT("TryToInitializeUser failed because player %d has already started the login process with diffrent settings!"), Params.LocalPlayerIndex);
+			return false;
+		}
+	}
+
+	// Set desired index now so if it creates a player it knows what controller to use
+	LocalUserInfo->PrimaryInputDevice = Params.PrimaryInputDevice;
+	LocalUserInfo->PlatformUser = Params.PlatformUser;
+	LocalUserInfo->bCanBeGuest = Params.bCanUseGuestLogin;
+	RefreshLocalUserInfo(LocalUserInfo);
+
+	// Either doing an initial or network login
+	if (LocalUserInfo->GetPrivilegeAvailability(ECommonUserPrivilege::CanPlay) == ECommonUserAvailability::NowAvailable && Params.RequestedPrivilege == ECommonUserPrivilege::CanPlayOnline)
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::DoingNetworkLogin;
+	}
+	else
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::DoingInitialLogin;
+	}
+
+	LoginLocalUser(LocalUserInfo, Params.RequestedPrivilege, Params.OnlineContext, FOnLocalUserLoginCompleteDelegate::CreateUObject(this, &ThisClass::HandleLoginForUserInitialize, Params));
+
+	return true;
+}
+
+void UCommonUserSubsystem::ListenForLoginKeyInput(TArray<FKey> AnyUserKeys, TArray<FKey> NewUserKeys, FCommonUserInitializeParams Params)
+{
+	UGameViewportClient* ViewportClient = GetGameInstance()->GetGameViewportClient();
+	if (ensure(ViewportClient))
+	{
+		const bool bIsMapped = LoginKeysForAnyUser.Num() > 0 || LoginKeysForNewUser.Num() > 0;
+		const bool bShouldBeMapped = AnyUserKeys.Num() > 0 || NewUserKeys.Num() > 0;
+
+		if (bIsMapped && !bShouldBeMapped)
+		{
+			// Set it back to wrapped handler
+			ViewportClient->OnOverrideInputKey() = WrappedInputKeyHandler;
+			WrappedInputKeyHandler.Unbind();
+		}
+		else if (!bIsMapped && bShouldBeMapped)
+		{
+			// Set up a wrapped handler
+			WrappedInputKeyHandler = ViewportClient->OnOverrideInputKey();
+			ViewportClient->OnOverrideInputKey().BindUObject(this, &UCommonUserSubsystem::OverrideInputKeyForLogin);
+		}
+
+		LoginKeysForAnyUser = AnyUserKeys;
+		LoginKeysForNewUser = NewUserKeys;
+
+		if (bShouldBeMapped)
+		{
+			ParamsForLoginKey = Params;
+		}
+		else
+		{
+			ParamsForLoginKey = FCommonUserInitializeParams();
+		}
+	}
+}
+
+bool UCommonUserSubsystem::CancelUserInitialization(int32 LocalPlayerIndex)
+{
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(LocalPlayerIndex));
+	if (!LocalUserInfo)
+	{
+		return false;
+	}
+
+	if (!LocalUserInfo->IsDoingLogin())
+	{
+		return false;
+	}
+
+	// Remove from login queue
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		if (Request->UserInfo.IsValid() && Request->UserInfo->LocalPlayerIndex == LocalPlayerIndex)
+		{
+			ActiveLoginRequests.Remove(Request);
+		}
+	}
+
+	// Set state with best guess
+	if (LocalUserInfo->InitializationState == ECommonUserInitializationState::DoingNetworkLogin)
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::LoggedInLocalOnly;
+	}
+	else
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::FailedtoLogin;
+	}
+
+	return true;
+}
+
+bool UCommonUserSubsystem::TryToLogOutUser(int32 LocalPlayerIndex, bool bDestroyPlayer)
+{
+	UGameInstance* GameInstance = GetGameInstance();
+	
+	if (!ensure(GameInstance))
+	{
+		return false;
+	}
+
+	if (LocalPlayerIndex == 0 && bDestroyPlayer)
+	{
+		UE_LOG(LogCommonUser, Error, TEXT("TryToLogOutUser cannot destroy player 0"));
+		return false;
+	}
+
+	CancelUserInitialization(LocalPlayerIndex);
+	
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(LocalPlayerIndex));
+	if (!LocalUserInfo)
+	{
+		UE_LOG(LogCommonUser, Warning, TEXT("TryToLogOutUser failed to log out user %i because they are not logged in"), LocalPlayerIndex);
+		return false;
+	}
+
+	FPlatformUserId UserId = LocalUserInfo->PlatformUser;
+	if (IsRealPlatformUser(UserId))
+	{
+		// Currently this does not do platform logout in case they want to log back in immediately after
+		UE_LOG(LogCommonUser, Log, TEXT("TryToLogOutUser succeeded for real platform user %d"), UserId.GetInternalId());
+
+		LogOutLocalUser(UserId);
+	}
+	else if (ensure(LocalUserInfo->bIsGuest))
+	{
+		// For guest users just delete it
+		UE_LOG(LogCommonUser, Log, TEXT("TryToLogOutUser succeeded for guest player index %d"), LocalPlayerIndex);
+
+		LocalUserInfos.Remove(LocalPlayerIndex);
+	}
+
+	if (bDestroyPlayer)
+	{
+		ULocalPlayer* ExistingPlayer = GameInstance->FindLocalPlayerFromPlatformUserId(UserId);
+
+		if (ExistingPlayer)
+		{
+			GameInstance->RemoveLocalPlayer(ExistingPlayer);
+		}
+	}
+
+	return true;
+}
+
+void UCommonUserSubsystem::ResetUserState()
+{
+	// Manually purge existing info objects
+	for (TPair<int32, UCommonUserInfo*> Pair : LocalUserInfos)
+	{
+		if (Pair.Value)
+		{
+			Pair.Value->MarkAsGarbage();
+		}
+	}
+
+	LocalUserInfos.Reset();
+
+	// Cancel in-progress logins
+	ActiveLoginRequests.Reset();
+
+	// Create player info for id 0
+	UCommonUserInfo* FirstUser = CreateLocalUserInfo(0);
+
+	FirstUser->PlatformUser = IPlatformInputDeviceMapper::Get().GetPrimaryPlatformUser();
+	FirstUser->PrimaryInputDevice = IPlatformInputDeviceMapper::Get().GetPrimaryInputDeviceForUser(FirstUser->PlatformUser);
+
+	// TODO: Schedule a refresh of player 0 for next frame?
+	RefreshLocalUserInfo(FirstUser);
+}
+
+bool UCommonUserSubsystem::OverrideInputKeyForLogin(FInputKeyEventArgs& EventArgs)
+{
+	int32 NextLocalPlayerIndex = INDEX_NONE;
+
+	const UCommonUserInfo* MappedUser = GetUserInfoForInputDevice(EventArgs.InputDevice);
+	if (EventArgs.Event == IE_Pressed)
+	{
+		if (MappedUser == nullptr || !MappedUser->IsLoggedIn())
+		{
+			if (MappedUser)
+			{
+				NextLocalPlayerIndex = MappedUser->LocalPlayerIndex;
+			}
+			else
+			{
+				// Find next player
+				for (int32 i = 0; i < MaxNumberOfLocalPlayers; i++)
+				{
+					if (GetLocalPlayerInitializationState(i) == ECommonUserInitializationState::Unknown)
+					{
+						NextLocalPlayerIndex = i;
+						break;
+					}
+				}
+			}
+
+			if (NextLocalPlayerIndex != INDEX_NONE)
+			{
+				if (LoginKeysForAnyUser.Contains(EventArgs.Key))
+				{
+					// If we're in the middle of logging in just return true to ignore platform-specific input
+					if (MappedUser && MappedUser->IsDoingLogin())
+					{
+						return true;
+					}
+
+					// Press start screen
+					FCommonUserInitializeParams NewParams = ParamsForLoginKey;
+					NewParams.LocalPlayerIndex = NextLocalPlayerIndex;
+					NewParams.PrimaryInputDevice = EventArgs.InputDevice;
+
+					return TryToInitializeUser(NewParams);
+				}
+
+				// See if this controller id is mapped
+				MappedUser = GetUserInfoForInputDevice(EventArgs.InputDevice);
+
+				if (!MappedUser || MappedUser->LocalPlayerIndex == INDEX_NONE)
+				{
+					if (LoginKeysForNewUser.Contains(EventArgs.Key))
+					{
+						// If we're in the middle of logging in just return true to ignore platform-specific input
+						if (MappedUser && MappedUser->IsDoingLogin())
+						{
+							return true;
+						}
+
+						// Local multiplayer
+						FCommonUserInitializeParams NewParams = ParamsForLoginKey;
+						NewParams.LocalPlayerIndex = NextLocalPlayerIndex;
+						NewParams.PrimaryInputDevice = EventArgs.InputDevice;
+
+						return TryToInitializeUser(NewParams);
+					}
+				}
+			}
+		}
+	}
+
+	if (WrappedInputKeyHandler.IsBound())
+	{
+		return WrappedInputKeyHandler.Execute(EventArgs);
+	}
+
+	return false;
+}
+
+static inline FText GetErrorText(const FOnlineErrorType& InOnlineError)
+{
+#if COMMONUSER_OSSV1
+	return InOnlineError.GetErrorMessage();
+#else
+	return InOnlineError.GetText();
+#endif
+}
+
+void UCommonUserSubsystem::HandleLoginForUserInitialize(const UCommonUserInfo* UserInfo, ELoginStatusType NewStatus, FUniqueNetIdRepl NetId, const TOptional<FOnlineErrorType>& InError, ECommonUserOnlineContext Context, FCommonUserInitializeParams Params)
+{
+	UGameInstance* GameInstance = GetGameInstance();
+	check(GameInstance);
+	FTimerManager& TimerManager = GameInstance->GetTimerManager();
+	TOptional<FOnlineErrorType> Error = InError; // Copy so we can reset on handled errors
+
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(UserInfo);
+	UCommonUserInfo* FirstUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(0));
+
+	if (!ensure(LocalUserInfo && FirstUserInfo))
+	{
+		return;
+	}
+
+	// Check the hard platform/service ids
+	RefreshLocalUserInfo(LocalUserInfo);
+
+	FUniqueNetIdRepl FirstPlayerId = FirstUserInfo->GetNetId(ECommonUserOnlineContext::PlatformOrDefault);
+
+	// Check to see if we should make a guest after a login failure. Some platforms return success but reuse the first player's id, count this as a failure
+	if (LocalUserInfo != FirstUserInfo && LocalUserInfo->bCanBeGuest && (NewStatus == ELoginStatusType::NotLoggedIn || NetId == FirstPlayerId))
+	{
+#if COMMONUSER_OSSV1
+		NetId = (FUniqueNetIdRef)FUniqueNetIdString::Create(FString::Printf(TEXT("GuestPlayer%d"), LocalUserInfo->LocalPlayerIndex), NULL_SUBSYSTEM);
+#else
+		// TODO:  OSSv2 FUniqueNetIdRepl wrapping FAccountId is in progress
+		// TODO:  OSSv2 - How to handle guest accounts?
+#endif
+		LocalUserInfo->bIsGuest = true;
+		NewStatus = ELoginStatusType::UsingLocalProfile;
+		Error.Reset();
+		UE_LOG(LogCommonUser, Log, TEXT("HandleLoginForUserInitialize created guest id %s for local player %d"), *NetId.ToString(), LocalUserInfo->LocalPlayerIndex);
+	}
+	else
+	{
+		LocalUserInfo->bIsGuest = false;
+	}
+
+	ensure(LocalUserInfo->IsDoingLogin());
+
+	if (Error.IsSet())
+	{
+		FText ErrorText = GetErrorText(Error.GetValue());
+		TimerManager.SetTimerForNextTick(FTimerDelegate::CreateUObject(this, &UCommonUserSubsystem::HandleUserInitializeFailed, Params, ErrorText));
+		return;
+	}
+
+	if (Context == ECommonUserOnlineContext::Game)
+	{
+		LocalUserInfo->UpdateCachedNetId(NetId, ECommonUserOnlineContext::Game);
+	}
+		
+	ULocalPlayer* CurrentPlayer = GameInstance->GetLocalPlayerByIndex(LocalUserInfo->LocalPlayerIndex);
+	if (!CurrentPlayer && Params.bCanCreateNewLocalPlayer)
+	{
+		FString ErrorString;
+		CurrentPlayer = GameInstance->CreateLocalPlayer(LocalUserInfo->PlatformUser, ErrorString, true);
+
+		if (!CurrentPlayer)
+		{
+			TimerManager.SetTimerForNextTick(FTimerDelegate::CreateUObject(this, &UCommonUserSubsystem::HandleUserInitializeFailed, Params, FText::AsCultureInvariant(ErrorString)));
+			return;
+		}
+		ensure(GameInstance->GetLocalPlayerByIndex(LocalUserInfo->LocalPlayerIndex) == CurrentPlayer);
+	}
+
+	// Updates controller and net id if needed
+	SetLocalPlayerUserInfo(CurrentPlayer, LocalUserInfo);
+
+	// Set a delayed callback
+	TimerManager.SetTimerForNextTick(FTimerDelegate::CreateUObject(this, &UCommonUserSubsystem::HandleUserInitializeSucceeded, Params));
+}
+
+void UCommonUserSubsystem::HandleUserInitializeFailed(FCommonUserInitializeParams Params, FText Error)
+{
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(Params.LocalPlayerIndex));
+
+	if (!LocalUserInfo)
+	{
+		// The user info was reset since this was scheduled
+		return;
+	}
+
+	UE_LOG(LogCommonUser, Warning, TEXT("TryToInitializeUser %d failed with error %s"), LocalUserInfo->LocalPlayerIndex, *Error.ToString());
+
+	// If state is wrong, abort as we might have gotten canceled
+	if (!ensure(LocalUserInfo->IsDoingLogin()))
+	{
+		return;
+	}
+
+	// If initial login failed or we ended up totally logged out, set to complete failure
+	ELoginStatusType NewStatus = GetLocalUserLoginStatus(Params.PlatformUser, Params.OnlineContext);
+	if (NewStatus == ELoginStatusType::NotLoggedIn || LocalUserInfo->InitializationState == ECommonUserInitializationState::DoingInitialLogin)
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::FailedtoLogin;
+	}
+	else
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::LoggedInLocalOnly;
+	}
+
+	FText TitleText = NSLOCTEXT("CommonUser", "LoginFailedTitle", "Login Failure");
+
+	if (!Params.bSuppressLoginErrors)
+	{
+		SendSystemMessage(FCommonUserTags::SystemMessage_Error_InitializeLocalPlayerFailed, TitleText, Error);
+	}
+	
+	// Call callbacks
+	Params.OnUserInitializeComplete.ExecuteIfBound(LocalUserInfo, false, Error, Params.RequestedPrivilege, Params.OnlineContext);
+	OnUserInitializeComplete.Broadcast(LocalUserInfo, false, Error, Params.RequestedPrivilege, Params.OnlineContext);
+}
+
+void UCommonUserSubsystem::HandleUserInitializeSucceeded(FCommonUserInitializeParams Params)
+{
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(GetUserInfoForLocalPlayerIndex(Params.LocalPlayerIndex));
+
+	if (!LocalUserInfo)
+	{
+		// The user info was reset since this was scheduled
+		return;
+	}
+
+	// If state is wrong, abort as we might have gotten cancelled
+	if (!ensure(LocalUserInfo->IsDoingLogin()))
+	{
+		return;
+	}
+
+	// Fix up state
+	if (Params.RequestedPrivilege == ECommonUserPrivilege::CanPlayOnline)
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::LoggedInOnline;
+	}
+	else
+	{
+		LocalUserInfo->InitializationState = ECommonUserInitializationState::LoggedInLocalOnly;
+	}
+
+	ensure(LocalUserInfo->GetPrivilegeAvailability(Params.RequestedPrivilege) == ECommonUserAvailability::NowAvailable);
+
+	// Call callbacks
+	Params.OnUserInitializeComplete.ExecuteIfBound(LocalUserInfo, true, FText(), Params.RequestedPrivilege, Params.OnlineContext);
+	OnUserInitializeComplete.Broadcast(LocalUserInfo, true, FText(), Params.RequestedPrivilege, Params.OnlineContext);
+}
+
+bool UCommonUserSubsystem::LoginLocalUser(const UCommonUserInfo* UserInfo, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext Context, FOnLocalUserLoginCompleteDelegate OnComplete)
+{
+	UCommonUserInfo* LocalUserInfo = ModifyInfo(UserInfo);
+	if (!ensure(UserInfo))
+	{
+		return false;
+	}
+
+	TSharedRef<FUserLoginRequest> NewRequest = MakeShared<FUserLoginRequest>(LocalUserInfo, RequestedPrivilege, Context, MoveTemp(OnComplete));
+	ActiveLoginRequests.Add(NewRequest);
+
+	// This will execute callback or start login process
+	ProcessLoginRequest(NewRequest);
+
+	return true;
+}
+
+void UCommonUserSubsystem::ProcessLoginRequest(TSharedRef<FUserLoginRequest> Request)
+{
+	// First, see if we've fully logged in
+	UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+	if (!UserInfo)
+	{
+		// User is gone, just delete this request
+		ActiveLoginRequests.Remove(Request);
+
+		return;
+	}
+
+	const FPlatformUserId PlatformUser = UserInfo->GetPlatformUserId();
+
+	// If the platform user id is invalid because this is a guest, skip right to failure
+	if (!IsRealPlatformUser(PlatformUser))
+	{
+#if COMMONUSER_OSSV1
+		Request->Error = FOnlineError(NSLOCTEXT("CommonUser", "InvalidPlatformUser", "Invalid Platform User"));
+#else
+		Request->Error = UE::Online::Errors::InvalidUser();
+#endif
+		// Remove from active array
+		ActiveLoginRequests.Remove(Request);
+
+		// Execute delegate if bound
+		Request->Delegate.ExecuteIfBound(UserInfo, ELoginStatusType::NotLoggedIn, FUniqueNetIdRepl(), Request->Error, Request->DesiredContext);
+
+		return;
+	}
+
+	// Figure out what context to process first
+	if (Request->CurrentContext == ECommonUserOnlineContext::Invalid)
+	{
+		// First start with platform context if this is a game login
+		if (Request->DesiredContext == ECommonUserOnlineContext::Game)
+		{
+			Request->CurrentContext = ResolveOnlineContext(ECommonUserOnlineContext::PlatformOrDefault);
+		}
+		else
+		{
+			Request->CurrentContext = ResolveOnlineContext(Request->DesiredContext);
+		}
+	}
+
+	ELoginStatusType CurrentStatus = GetLocalUserLoginStatus(PlatformUser, Request->CurrentContext);
+	FUniqueNetIdRepl CurrentId = GetLocalUserNetId(PlatformUser, Request->CurrentContext);
+	FOnlineContextCache* System = GetContextCache(Request->CurrentContext);
+
+	if (!ensure(System))
+	{
+		return;
+	}
+
+	// Starting a new request
+	if (Request->OverallLoginState == ECommonUserAsyncTaskState::NotStarted)
+	{
+		Request->OverallLoginState = ECommonUserAsyncTaskState::InProgress;
+	}
+
+	bool bHasRequiredStatus = (CurrentStatus == ELoginStatusType::LoggedIn);
+	if (Request->DesiredPrivilege == ECommonUserPrivilege::CanPlay)
+	{
+		// If this is not an online required login, allow local profile to count as fully logged in
+		bHasRequiredStatus |= (CurrentStatus == ELoginStatusType::UsingLocalProfile);
+	}
+
+	// Check for overall success
+	if (bHasRequiredStatus && CurrentId.IsValid())
+	{
+		// Stall if we're waiting for the login UI to close
+		if (Request->LoginUIState == ECommonUserAsyncTaskState::InProgress)
+		{
+			return;
+		}
+
+		Request->OverallLoginState = ECommonUserAsyncTaskState::Done;
+	}
+	else
+	{
+		// Try using platform auth to login
+		if (Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::NotStarted)
+		{
+			Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::InProgress;
+
+			if (TransferPlatformAuth(System, Request, PlatformUser))
+			{
+				return;
+			}
+			// We didn't start a login attempt, so set failure
+			Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::Failed;
+		}
+
+		// Next check AutoLogin
+		if (Request->AutoLoginState == ECommonUserAsyncTaskState::NotStarted)
+		{
+			if (Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::Done || Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::Failed)
+			{
+				Request->AutoLoginState = ECommonUserAsyncTaskState::InProgress;
+
+				// Try an auto login with default credentials, this will work on many platforms
+				if (AutoLogin(System, Request, PlatformUser))
+				{
+					return;
+				}
+				// We didn't start an autologin attempt, so set failure
+				Request->AutoLoginState = ECommonUserAsyncTaskState::Failed;
+			}
+		}
+
+		// Next check login UI
+		if (Request->LoginUIState == ECommonUserAsyncTaskState::NotStarted)
+		{
+			if ((Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::Done || Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::Failed)
+				&& (Request->AutoLoginState == ECommonUserAsyncTaskState::Done || Request->AutoLoginState == ECommonUserAsyncTaskState::Failed))
+			{
+				Request->LoginUIState = ECommonUserAsyncTaskState::InProgress;
+
+				if (ShowLoginUI(System, Request, PlatformUser))
+				{
+					return;
+				}
+				// We didn't show a UI, so set failure
+				Request->LoginUIState = ECommonUserAsyncTaskState::Failed;
+			}
+		}
+	}
+
+	// Check for overall failure
+	if (Request->LoginUIState == ECommonUserAsyncTaskState::Failed &&
+		Request->AutoLoginState == ECommonUserAsyncTaskState::Failed &&
+		Request->TransferPlatformAuthState == ECommonUserAsyncTaskState::Failed)
+	{
+		Request->OverallLoginState = ECommonUserAsyncTaskState::Failed;
+	}
+	else if (Request->OverallLoginState == ECommonUserAsyncTaskState::InProgress &&
+		Request->LoginUIState != ECommonUserAsyncTaskState::InProgress &&
+		Request->AutoLoginState != ECommonUserAsyncTaskState::InProgress &&
+		Request->TransferPlatformAuthState != ECommonUserAsyncTaskState::InProgress)
+	{
+		// If none of the substates are still in progress but we haven't successfully logged in, mark this as a failure to avoid stalling forever
+		Request->OverallLoginState = ECommonUserAsyncTaskState::Failed;
+	}
+
+	if (Request->OverallLoginState == ECommonUserAsyncTaskState::Done)
+	{
+		// Do the permissions check if needed
+		if (Request->PrivilegeCheckState == ECommonUserAsyncTaskState::NotStarted)
+		{
+			Request->PrivilegeCheckState = ECommonUserAsyncTaskState::InProgress;
+
+			ECommonUserPrivilegeResult CachedResult = UserInfo->GetCachedPrivilegeResult(Request->DesiredPrivilege, Request->CurrentContext);
+			if (CachedResult == ECommonUserPrivilegeResult::Available)
+			{
+				// Use cached success value
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Done;
+			}
+			else
+			{
+				if (QueryUserPrivilege(System, Request, PlatformUser))
+				{
+					return;
+				}
+				else
+				{
+#if !COMMONUSER_OSSV1
+					// Temp while OSSv2 gets privileges implemented
+					CachedResult = ECommonUserPrivilegeResult::Available;
+					Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Done;
+#endif
+				}
+			}
+		}
+
+		if (Request->PrivilegeCheckState == ECommonUserAsyncTaskState::Failed)
+		{
+			// Count a privilege failure as a login failure
+			Request->OverallLoginState = ECommonUserAsyncTaskState::Failed;
+		}
+		else if (Request->PrivilegeCheckState == ECommonUserAsyncTaskState::Done)
+		{
+			// If platform context done but still need to do service context, do that next
+			ECommonUserOnlineContext ResolvedDesiredContext = ResolveOnlineContext(Request->DesiredContext);
+
+			if (Request->OverallLoginState == ECommonUserAsyncTaskState::Done && Request->CurrentContext != ResolvedDesiredContext)
+			{
+				Request->CurrentContext = ResolvedDesiredContext;
+				Request->OverallLoginState = ECommonUserAsyncTaskState::NotStarted;
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::NotStarted;
+				Request->TransferPlatformAuthState = ECommonUserAsyncTaskState::NotStarted;
+				Request->AutoLoginState = ECommonUserAsyncTaskState::NotStarted;
+				Request->LoginUIState = ECommonUserAsyncTaskState::NotStarted;
+
+				// Reprocess and immediately return
+				ProcessLoginRequest(Request);
+				return;
+			}
+		}
+	}
+
+	if (Request->PrivilegeCheckState == ECommonUserAsyncTaskState::InProgress)
+	{
+		// Stall to wait for it to finish
+		return;
+	}
+
+	// If done, remove and do callback
+	if (Request->OverallLoginState == ECommonUserAsyncTaskState::Done || Request->OverallLoginState == ECommonUserAsyncTaskState::Failed)
+	{
+		// Skip if this already happened in a nested function
+		if (ActiveLoginRequests.Contains(Request))
+		{
+			// Add a generic error if none is set
+			if (Request->OverallLoginState == ECommonUserAsyncTaskState::Failed && !Request->Error.IsSet())
+			{
+	#if COMMONUSER_OSSV1
+				Request->Error = FOnlineError(NSLOCTEXT("CommonUser", "FailedToRequest", "Failed to Request Login"));
+	#else
+				Request->Error = UE::Online::Errors::RequestFailure();
+	#endif
+			}
+
+			// Remove from active array
+			ActiveLoginRequests.Remove(Request);
+
+			// Execute delegate if bound
+			Request->Delegate.ExecuteIfBound(UserInfo, CurrentStatus, CurrentId, Request->Error, Request->DesiredContext);
+		}
+	}
+}
+
+#if COMMONUSER_OSSV1
+void UCommonUserSubsystem::HandleUserLoginCompleted(int32 PlatformUserIndex, bool bWasSuccessful, const FUniqueNetId& NetId, const FString& ErrorString, ECommonUserOnlineContext Context)
+{
+	FPlatformUserId PlatformUser = GetPlatformUserIdForIndex(PlatformUserIndex);
+	ELoginStatusType NewStatus = GetLocalUserLoginStatus(PlatformUser, Context);
+	FUniqueNetIdRepl NewId = FUniqueNetIdRepl(NetId);
+	UE_LOG(LogCommonUser, Log, TEXT("Player login Completed - System:%s, UserIdx:%d, Successful:%d, NewStatus:%s, NewId:%s, ErrorIfAny:%s"),
+		*GetOnlineSubsystemName(Context).ToString(),
+		PlatformUserIndex,
+		(int32)bWasSuccessful,
+		ELoginStatus::ToString(NewStatus),
+		*NewId.ToString(),
+		*ErrorString);
+
+	// Update any waiting login requests
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+		if (!UserInfo)
+		{
+			// User is gone, just delete this request
+			ActiveLoginRequests.Remove(Request);
+
+			continue;
+		}
+
+		if (UserInfo->PlatformUser == PlatformUser && Request->CurrentContext == Context)
+		{
+			// On some platforms this gets called from the login UI with a failure
+			if (Request->AutoLoginState == ECommonUserAsyncTaskState::InProgress)
+			{
+				Request->AutoLoginState = bWasSuccessful ? ECommonUserAsyncTaskState::Done : ECommonUserAsyncTaskState::Failed;
+			}
+
+			if (!bWasSuccessful)
+			{
+				Request->Error = FOnlineError(FText::FromString(ErrorString));
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+
+void UCommonUserSubsystem::HandleOnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInNetId, const int PlatformUserIndex, const FOnlineError& Error, ECommonUserOnlineContext Context)
+{
+	FPlatformUserId PlatformUser = GetPlatformUserIdForIndex(PlatformUserIndex);
+
+	// Update any waiting login requests
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+		if (!UserInfo)
+		{
+			// User is gone, just delete this request
+			ActiveLoginRequests.Remove(Request);
+
+			continue;
+		}
+
+		// Look for first user trying to log in on this context
+		if (Request->CurrentContext == Context && Request->LoginUIState == ECommonUserAsyncTaskState::InProgress)
+		{
+			if (LoggedInNetId.IsValid() && LoggedInNetId->IsValid() && Error.WasSuccessful())
+			{
+				// The platform user id that actually logged in may not be the same one who requested the UI,
+				// so swap it if the returned id is actually valid
+				if (UserInfo->PlatformUser != PlatformUser && PlatformUser != PLATFORMUSERID_NONE)
+				{
+					UserInfo->PlatformUser = PlatformUser;
+				}
+
+				Request->LoginUIState = ECommonUserAsyncTaskState::Done;
+				Request->Error.Reset();
+			}
+			else
+			{
+				Request->LoginUIState = ECommonUserAsyncTaskState::Failed;
+				Request->Error = Error;
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+
+void UCommonUserSubsystem::HandleCheckPrivilegesComplete(const FUniqueNetId& UserId, EUserPrivileges::Type Privilege, uint32 PrivilegeResults, ECommonUserPrivilege UserPrivilege, TWeakObjectPtr<UCommonUserInfo> CommonUserInfo, ECommonUserOnlineContext Context)
+{
+	// Only handle if user still exists
+	UCommonUserInfo* UserInfo = CommonUserInfo.Get();
+
+	if (!UserInfo)
+	{
+		return;
+	}
+
+	ECommonUserPrivilegeResult UserResult = ConvertOSSPrivilegeResult(Privilege, PrivilegeResults);
+
+	// Update the user cached value
+	UpdateUserPrivilegeResult(UserInfo, UserPrivilege, UserResult, Context);
+
+	FOnlineContextCache* ContextCache = GetContextCache(Context);
+	check(ContextCache);
+
+	// If this returns disconnected, update the connection status
+	if (UserResult == ECommonUserPrivilegeResult::NetworkConnectionUnavailable)
+	{
+		ContextCache->CurrentConnectionStatus = EOnlineServerConnectionStatus::NoNetworkConnection;
+	}
+	else if (UserResult == ECommonUserPrivilegeResult::Available && UserPrivilege == ECommonUserPrivilege::CanPlayOnline)
+	{
+		if (ContextCache->CurrentConnectionStatus == EOnlineServerConnectionStatus::NoNetworkConnection)
+		{
+			ContextCache->CurrentConnectionStatus = EOnlineServerConnectionStatus::Normal;
+		}
+	}
+		
+	// See if a login request is waiting on this
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		if (Request->UserInfo.Get() == UserInfo && Request->CurrentContext == Context && Request->DesiredPrivilege == UserPrivilege && Request->PrivilegeCheckState == ECommonUserAsyncTaskState::InProgress)
+		{
+			if (UserResult == ECommonUserPrivilegeResult::Available)
+			{
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Done;
+			}
+			else
+			{
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Failed;
+
+				// Forms strings in english like "(The user is not allowed) to (play the game)"
+				Request->Error = FOnlineError(FText::Format(NSLOCTEXT("CommonUser", "PrivilegeFailureFormat", "{0} to {1}"), GetPrivilegeResultDescription(UserResult), GetPrivilegeDescription(UserPrivilege)));
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+#else
+
+void UCommonUserSubsystem::HandleUserLoginCompletedV2(const UE::Online::TOnlineResult<UE::Online::FAuthLogin>& Result, FPlatformUserId PlatformUser, ECommonUserOnlineContext Context)
+{
+	const bool bWasSuccessful = Result.IsOk();
+	FAccountId NewId;
+	if (bWasSuccessful)
+	{
+		NewId = Result.GetOkValue().AccountInfo->AccountId;
+	}
+	
+	ELoginStatusType NewStatus = GetLocalUserLoginStatus(PlatformUser, Context);
+	UE_LOG(LogCommonUser, Log, TEXT("Player login Completed - System:%d, UserIdx:%d, Successful:%d, NewId:%s, ErrorIfAny:%s"),
+		(int32)Context,
+		PlatformUser.GetInternalId(),
+		(int32)Result.IsOk(),
+		*ToLogString(NewId),
+		Result.IsError() ? *Result.GetErrorValue().GetLogString() : TEXT(""));
+
+	// Update any waiting login requests
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+		if (!UserInfo)
+		{
+			// User is gone, just delete this request
+			ActiveLoginRequests.Remove(Request);
+
+			continue;
+		}
+
+		if (UserInfo->PlatformUser == PlatformUser && Request->CurrentContext == Context)
+		{
+			// On some platforms this gets called from the login UI with a failure
+			if (Request->AutoLoginState == ECommonUserAsyncTaskState::InProgress)
+			{
+				Request->AutoLoginState = bWasSuccessful ? ECommonUserAsyncTaskState::Done : ECommonUserAsyncTaskState::Failed;
+			}
+
+			if (bWasSuccessful)
+			{
+				Request->Error.Reset();
+			}
+			else
+			{
+				Request->Error = Result.GetErrorValue();
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+
+void UCommonUserSubsystem::HandleOnLoginUIClosedV2(const UE::Online::TOnlineResult<UE::Online::FExternalUIShowLoginUI>& Result, FPlatformUserId PlatformUser, ECommonUserOnlineContext Context)
+{
+	// Update any waiting login requests
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		UCommonUserInfo* UserInfo = Request->UserInfo.Get();
+
+		if (!UserInfo)
+		{
+			// User is gone, just delete this request
+			ActiveLoginRequests.Remove(Request);
+
+			continue;
+		}
+
+		// Look for first user trying to log in on this context
+		if (Request->CurrentContext == Context && Request->LoginUIState == ECommonUserAsyncTaskState::InProgress)
+		{
+			if (Result.IsOk())
+			{
+				// The platform user id that actually logged in may not be the same one who requested the UI,
+				// so swap it if the returned id is actually valid
+				if (UserInfo->PlatformUser != PlatformUser && PlatformUser != PLATFORMUSERID_NONE)
+				{
+					UserInfo->PlatformUser = PlatformUser;
+				}
+
+				Request->LoginUIState = ECommonUserAsyncTaskState::Done;
+				Request->Error.Reset();
+			}
+			else
+			{
+				Request->LoginUIState = ECommonUserAsyncTaskState::Failed;
+				Request->Error = Result.GetErrorValue();
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+
+void UCommonUserSubsystem::HandleCheckPrivilegesComplete(const UE::Online::TOnlineResult<UE::Online::FQueryUserPrivilege>& Result, TWeakObjectPtr<UCommonUserInfo> CommonUserInfo, EUserPrivileges DesiredPrivilege, ECommonUserOnlineContext Context)
+{
+	// Only handle if user still exists
+	UCommonUserInfo* UserInfo = CommonUserInfo.Get();
+	if (!UserInfo)
+	{
+		return;
+	}
+
+	ECommonUserPrivilege UserPrivilege = ConvertOnlineServicesPrivilege(DesiredPrivilege);
+	ECommonUserPrivilegeResult UserResult = ECommonUserPrivilegeResult::PlatformFailure;
+	if (const FQueryUserPrivilege::Result* OkResult = Result.TryGetOkValue())
+	{
+		UserResult = ConvertOnlineServicesPrivilegeResult(DesiredPrivilege, OkResult->PrivilegeResult);
+	}
+	else
+	{
+		UE_LOG(LogCommonUser, Warning, TEXT("QueryUserPrivilege failed: %s"), *Result.GetErrorValue().GetLogString());
+	}
+
+	// Update the user cached value
+	UserInfo->UpdateCachedPrivilegeResult(UserPrivilege, UserResult, Context);
+
+	// See if a login request is waiting on this
+	TArray<TSharedRef<FUserLoginRequest>> RequestsCopy = ActiveLoginRequests;
+	for (TSharedRef<FUserLoginRequest>& Request : RequestsCopy)
+	{
+		if (Request->UserInfo.Get() == UserInfo && Request->CurrentContext == Context && Request->DesiredPrivilege == UserPrivilege && Request->PrivilegeCheckState == ECommonUserAsyncTaskState::InProgress)
+		{
+			if (UserResult == ECommonUserPrivilegeResult::Available)
+			{
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Done;
+			}
+			else
+			{
+				Request->PrivilegeCheckState = ECommonUserAsyncTaskState::Failed;
+				Request->Error = Result.IsError() ? Result.GetErrorValue() : UE::Online::Errors::Unknown();
+			}
+
+			ProcessLoginRequest(Request);
+		}
+	}
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonUserSubsystem::RefreshLocalUserInfo(UCommonUserInfo* UserInfo)
+{
+	if (ensure(UserInfo))
+	{
+		// Always update default
+		UserInfo->UpdateCachedNetId(GetLocalUserNetId(UserInfo->PlatformUser, ECommonUserOnlineContext::Default), ECommonUserOnlineContext::Default);
+
+		if (HasSeparatePlatformContext())
+		{
+			// Also update platform
+			UserInfo->UpdateCachedNetId(GetLocalUserNetId(UserInfo->PlatformUser, ECommonUserOnlineContext::Platform), ECommonUserOnlineContext::Platform);
+		}
+	}
+}
+
+void UCommonUserSubsystem::HandleChangedAvailability(UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserAvailability OldAvailability)
+{
+	ECommonUserAvailability NewAvailability = UserInfo->GetPrivilegeAvailability(Privilege);
+
+	if (OldAvailability != NewAvailability)
+	{
+		OnUserPrivilegeChanged.Broadcast(UserInfo, Privilege, OldAvailability, NewAvailability);
+	}
+}
+
+void UCommonUserSubsystem::UpdateUserPrivilegeResult(UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserPrivilegeResult Result, ECommonUserOnlineContext Context)
+{
+	check(UserInfo);
+	
+	ECommonUserAvailability OldAvailability = UserInfo->GetPrivilegeAvailability(Privilege);
+
+	UserInfo->UpdateCachedPrivilegeResult(Privilege, Result, Context);
+
+	HandleChangedAvailability(UserInfo, Privilege, OldAvailability);
+}
+
+#if COMMONUSER_OSSV1
+ECommonUserPrivilege UCommonUserSubsystem::ConvertOSSPrivilege(EUserPrivileges::Type Privilege) const
+{
+	switch (Privilege)
+	{
+	case EUserPrivileges::CanPlay:
+		return ECommonUserPrivilege::CanPlay;
+	case EUserPrivileges::CanPlayOnline:
+		return ECommonUserPrivilege::CanPlayOnline;
+	case EUserPrivileges::CanCommunicateOnline:
+		return ECommonUserPrivilege::CanCommunicateViaTextOnline; // No good thing to do here, just mapping to text.
+	case EUserPrivileges::CanUseUserGeneratedContent:
+		return ECommonUserPrivilege::CanUseUserGeneratedContent;
+	case EUserPrivileges::CanUserCrossPlay:
+		return ECommonUserPrivilege::CanUseCrossPlay;
+	default:
+		return ECommonUserPrivilege::Invalid_Count;
+	}
+}
+
+EUserPrivileges::Type UCommonUserSubsystem::ConvertOSSPrivilege(ECommonUserPrivilege Privilege) const
+{
+	switch (Privilege)
+	{
+	case ECommonUserPrivilege::CanPlay:
+		return EUserPrivileges::CanPlay;
+	case ECommonUserPrivilege::CanPlayOnline:
+		return EUserPrivileges::CanPlayOnline;
+	case ECommonUserPrivilege::CanCommunicateViaTextOnline:
+	case ECommonUserPrivilege::CanCommunicateViaVoiceOnline:
+		return EUserPrivileges::CanCommunicateOnline;
+	case ECommonUserPrivilege::CanUseUserGeneratedContent:
+		return EUserPrivileges::CanUseUserGeneratedContent;
+	case ECommonUserPrivilege::CanUseCrossPlay:
+		return EUserPrivileges::CanUserCrossPlay;
+	default:
+		// No failure type, return CanPlay
+		return EUserPrivileges::CanPlay;
+	}
+}
+
+ECommonUserPrivilegeResult UCommonUserSubsystem::ConvertOSSPrivilegeResult(EUserPrivileges::Type Privilege, uint32 Results) const
+{
+	// The V1 results enum is a bitfield where each platform behaves a bit differently
+	if (Results == (uint32)IOnlineIdentity::EPrivilegeResults::NoFailures)
+	{
+		return ECommonUserPrivilegeResult::Available;
+	}
+	if ((Results & (uint32)IOnlineIdentity::EPrivilegeResults::UserNotFound) || (Results & (uint32)IOnlineIdentity::EPrivilegeResults::UserNotLoggedIn))
+	{
+		return ECommonUserPrivilegeResult::UserNotLoggedIn;
+	}
+	if ((Results & (uint32)IOnlineIdentity::EPrivilegeResults::RequiredPatchAvailable) || (Results & (uint32)IOnlineIdentity::EPrivilegeResults::RequiredSystemUpdate))
+	{
+		return ECommonUserPrivilegeResult::VersionOutdated;
+	}
+	if (Results & (uint32)IOnlineIdentity::EPrivilegeResults::AgeRestrictionFailure)
+	{
+		return ECommonUserPrivilegeResult::AgeRestricted;
+	}
+	if (Results & (uint32)IOnlineIdentity::EPrivilegeResults::AccountTypeFailure)
+	{
+		return ECommonUserPrivilegeResult::AccountTypeRestricted;
+	}
+	if (Results & (uint32)IOnlineIdentity::EPrivilegeResults::NetworkConnectionUnavailable)
+	{
+		return ECommonUserPrivilegeResult::NetworkConnectionUnavailable;
+	}
+
+	// Bucket other account failures together
+	uint32 AccountUseFailures = (uint32)IOnlineIdentity::EPrivilegeResults::OnlinePlayRestricted 
+		| (uint32)IOnlineIdentity::EPrivilegeResults::UGCRestriction 
+		| (uint32)IOnlineIdentity::EPrivilegeResults::ChatRestriction;
+
+	if (Results & AccountUseFailures)
+	{
+		return ECommonUserPrivilegeResult::AccountUseRestricted;
+	}
+
+	// If you can't play at all, this is a license failure
+	if (Privilege == EUserPrivileges::CanPlay)
+	{
+		return ECommonUserPrivilegeResult::LicenseInvalid;
+	}
+
+	// Unknown reason
+	return ECommonUserPrivilegeResult::PlatformFailure;
+}
+#else
+ECommonUserPrivilege UCommonUserSubsystem::ConvertOnlineServicesPrivilege(EUserPrivileges Privilege) const
+{
+	switch (Privilege)
+	{
+	case EUserPrivileges::CanPlay:
+		return ECommonUserPrivilege::CanPlay;
+	case EUserPrivileges::CanPlayOnline:
+		return ECommonUserPrivilege::CanPlayOnline;
+	case EUserPrivileges::CanCommunicateViaTextOnline:
+		return ECommonUserPrivilege::CanCommunicateViaTextOnline;
+	case EUserPrivileges::CanCommunicateViaVoiceOnline:
+		return ECommonUserPrivilege::CanCommunicateViaVoiceOnline;
+	case EUserPrivileges::CanUseUserGeneratedContent:
+		return ECommonUserPrivilege::CanUseUserGeneratedContent;
+	case EUserPrivileges::CanCrossPlay:
+		return ECommonUserPrivilege::CanUseCrossPlay;
+	default:
+		return ECommonUserPrivilege::Invalid_Count;
+	}
+}
+
+EUserPrivileges UCommonUserSubsystem::ConvertOnlineServicesPrivilege(ECommonUserPrivilege Privilege) const
+{
+	switch (Privilege)
+	{
+	case ECommonUserPrivilege::CanPlay:
+		return EUserPrivileges::CanPlay;
+	case ECommonUserPrivilege::CanPlayOnline:
+		return EUserPrivileges::CanPlayOnline;
+	case ECommonUserPrivilege::CanCommunicateViaTextOnline:
+		return EUserPrivileges::CanCommunicateViaTextOnline;
+	case ECommonUserPrivilege::CanCommunicateViaVoiceOnline:
+		return EUserPrivileges::CanCommunicateViaVoiceOnline;
+	case ECommonUserPrivilege::CanUseUserGeneratedContent:
+		return EUserPrivileges::CanUseUserGeneratedContent;
+	case ECommonUserPrivilege::CanUseCrossPlay:
+		return EUserPrivileges::CanCrossPlay;
+	default:
+		// No failure type, return CanPlay
+		return EUserPrivileges::CanPlay;
+	}
+}
+
+ECommonUserPrivilegeResult UCommonUserSubsystem::ConvertOnlineServicesPrivilegeResult(EUserPrivileges Privilege, EPrivilegeResults Results) const
+{
+	// The V1 results enum is a bitfield where each platform behaves a bit differently
+	if (Results == EPrivilegeResults::NoFailures)
+	{
+		return ECommonUserPrivilegeResult::Available;
+	}
+	if (EnumHasAnyFlags(Results, EPrivilegeResults::UserNotFound | EPrivilegeResults::UserNotLoggedIn))
+	{
+		return ECommonUserPrivilegeResult::UserNotLoggedIn;
+	}
+	if (EnumHasAnyFlags(Results, EPrivilegeResults::RequiredPatchAvailable | EPrivilegeResults::RequiredSystemUpdate))
+	{
+		return ECommonUserPrivilegeResult::VersionOutdated;
+	}
+	if (EnumHasAnyFlags(Results, EPrivilegeResults::AgeRestrictionFailure))
+	{
+		return ECommonUserPrivilegeResult::AgeRestricted;
+	}
+	if (EnumHasAnyFlags(Results, EPrivilegeResults::AccountTypeFailure))
+	{
+		return ECommonUserPrivilegeResult::AccountTypeRestricted;
+	}
+	if (EnumHasAnyFlags(Results, EPrivilegeResults::NetworkConnectionUnavailable))
+	{
+		return ECommonUserPrivilegeResult::NetworkConnectionUnavailable;
+	}
+
+	// Bucket other account failures together
+	const EPrivilegeResults AccountUseFailures = EPrivilegeResults::OnlinePlayRestricted
+		| EPrivilegeResults::UGCRestriction
+		| EPrivilegeResults::ChatRestriction;
+
+	if (EnumHasAnyFlags(Results, AccountUseFailures))
+	{
+		return ECommonUserPrivilegeResult::AccountUseRestricted;
+	}
+
+	// If you can't play at all, this is a license failure
+	if (Privilege == EUserPrivileges::CanPlay)
+	{
+		return ECommonUserPrivilegeResult::LicenseInvalid;
+	}
+
+	// Unknown reason
+	return ECommonUserPrivilegeResult::PlatformFailure;
+}
+#endif // COMMONUSER_OSSV1
+
+FString UCommonUserSubsystem::PlatformUserIdToString(FPlatformUserId UserId)
+{
+	if (UserId == PLATFORMUSERID_NONE)
+	{
+		return TEXT("None");
+	}
+	else
+	{
+		return FString::Printf(TEXT("%d"), UserId.GetInternalId());
+	}
+}
+
+FString UCommonUserSubsystem::ECommonUserOnlineContextToString(ECommonUserOnlineContext Context)
+{
+	switch (Context)
+	{
+	case ECommonUserOnlineContext::Game:
+		return TEXT("Game");
+	case ECommonUserOnlineContext::Default:
+		return TEXT("Default");
+	case ECommonUserOnlineContext::Service:
+		return TEXT("Service");
+	case ECommonUserOnlineContext::ServiceOrDefault:
+		return TEXT("Service/Default");
+	case ECommonUserOnlineContext::Platform:
+		return TEXT("Platform");
+	case ECommonUserOnlineContext::PlatformOrDefault:
+		return TEXT("Platform/Default");
+	default:
+		return TEXT("Invalid");
+	}
+}
+
+FText UCommonUserSubsystem::GetPrivilegeDescription(ECommonUserPrivilege Privilege) const
+{
+	switch (Privilege)
+	{
+	case ECommonUserPrivilege::CanPlay:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanPlay", "play the game");
+	case ECommonUserPrivilege::CanPlayOnline:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanPlayOnline", "play online");
+	case ECommonUserPrivilege::CanCommunicateViaTextOnline:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanCommunicateViaTextOnline", "communicate with text");
+	case ECommonUserPrivilege::CanCommunicateViaVoiceOnline:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanCommunicateViaVoiceOnline", "communicate with voice");
+	case ECommonUserPrivilege::CanUseUserGeneratedContent:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanUseUserGeneratedContent", "access user content");
+	case ECommonUserPrivilege::CanUseCrossPlay:
+		return NSLOCTEXT("CommonUser", "PrivilegeCanUseCrossPlay", "play with other platforms");
+	default:
+		return NSLOCTEXT("CommonUser", "PrivilegeInvalid", "Invalid");
+	}
+}
+
+FText UCommonUserSubsystem::GetPrivilegeResultDescription(ECommonUserPrivilegeResult Result) const
+{
+	// TODO these strings might have cert requirements we need to override per console
+	switch (Result)
+	{
+	case ECommonUserPrivilegeResult::Unknown:
+		return NSLOCTEXT("CommonUser", "ResultUnknown", "Unknown if the user is allowed");
+	case ECommonUserPrivilegeResult::Available:
+		return NSLOCTEXT("CommonUser", "ResultAvailable", "The user is allowed");
+	case ECommonUserPrivilegeResult::UserNotLoggedIn:
+		return NSLOCTEXT("CommonUser", "ResultUserNotLoggedIn", "The user must login");
+	case ECommonUserPrivilegeResult::LicenseInvalid:
+		return NSLOCTEXT("CommonUser", "ResultLicenseInvalid", "A valid game license is required");
+	case ECommonUserPrivilegeResult::VersionOutdated:
+		return NSLOCTEXT("CommonUser", "VersionOutdated", "The game or hardware needs to be updated");
+	case ECommonUserPrivilegeResult::NetworkConnectionUnavailable:
+		return NSLOCTEXT("CommonUser", "ResultNetworkConnectionUnavailable", "A network connection is required");
+	case ECommonUserPrivilegeResult::AgeRestricted:
+		return NSLOCTEXT("CommonUser", "ResultAgeRestricted", "This age restricted account is not allowed");
+	case ECommonUserPrivilegeResult::AccountTypeRestricted:
+		return NSLOCTEXT("CommonUser", "ResultAccountTypeRestricted", "This account type does not have access");
+	case ECommonUserPrivilegeResult::AccountUseRestricted:
+		return NSLOCTEXT("CommonUser", "ResultAccountUseRestricted", "This account is not allowed");
+	case ECommonUserPrivilegeResult::PlatformFailure:
+		return NSLOCTEXT("CommonUser", "ResultPlatformFailure", "Not allowed");
+	default:
+		return NSLOCTEXT("CommonUser", "ResultInvalid", "Invalid");
+
+	}
+}
+
+const UCommonUserSubsystem::FOnlineContextCache* UCommonUserSubsystem::GetContextCache(ECommonUserOnlineContext Context) const
+{
+	return const_cast<UCommonUserSubsystem*>(this)->GetContextCache(Context);
+}
+
+UCommonUserSubsystem::FOnlineContextCache* UCommonUserSubsystem::GetContextCache(ECommonUserOnlineContext Context)
+{
+	switch (Context)
+	{
+	case ECommonUserOnlineContext::Game:
+	case ECommonUserOnlineContext::Default:
+		return DefaultContextInternal;
+
+	case ECommonUserOnlineContext::Service:
+		return ServiceContextInternal;
+	case ECommonUserOnlineContext::ServiceOrDefault:
+		return ServiceContextInternal ? ServiceContextInternal : DefaultContextInternal;
+
+	case ECommonUserOnlineContext::Platform:
+		return PlatformContextInternal;
+	case ECommonUserOnlineContext::PlatformOrDefault:
+		return PlatformContextInternal ? PlatformContextInternal : DefaultContextInternal;
+	}
+
+	return nullptr;
+}
+
+ECommonUserOnlineContext UCommonUserSubsystem::ResolveOnlineContext(ECommonUserOnlineContext Context) const
+{
+	switch (Context)
+	{
+	case ECommonUserOnlineContext::Game:
+	case ECommonUserOnlineContext::Default:
+		return ECommonUserOnlineContext::Default;
+
+	case ECommonUserOnlineContext::Service:
+		return ServiceContextInternal ? ECommonUserOnlineContext::Service : ECommonUserOnlineContext::Invalid;
+	case ECommonUserOnlineContext::ServiceOrDefault:
+		return ServiceContextInternal ? ECommonUserOnlineContext::Service : ECommonUserOnlineContext::Default;
+
+	case ECommonUserOnlineContext::Platform:
+		return PlatformContextInternal ? ECommonUserOnlineContext::Platform : ECommonUserOnlineContext::Invalid;
+	case ECommonUserOnlineContext::PlatformOrDefault:
+		return PlatformContextInternal ? ECommonUserOnlineContext::Platform : ECommonUserOnlineContext::Default;
+	}
+
+	return  ECommonUserOnlineContext::Invalid;
+}
+
+bool UCommonUserSubsystem::HasSeparatePlatformContext() const
+{
+	ECommonUserOnlineContext ServiceType = ResolveOnlineContext(ECommonUserOnlineContext::ServiceOrDefault);
+	ECommonUserOnlineContext PlatformType = ResolveOnlineContext(ECommonUserOnlineContext::PlatformOrDefault);
+
+	if (ServiceType != PlatformType)
+	{
+		return true;
+	}
+	return false;
+}
+
+void UCommonUserSubsystem::SetLocalPlayerUserInfo(ULocalPlayer* LocalPlayer, const UCommonUserInfo* UserInfo)
+{
+	if (!bIsDedicatedServer && ensure(LocalPlayer && UserInfo))
+	{
+		LocalPlayer->SetPlatformUserId(UserInfo->GetPlatformUserId());
+
+		FUniqueNetIdRepl NetId = UserInfo->GetNetId(ECommonUserOnlineContext::Game);
+		LocalPlayer->SetCachedUniqueNetId(NetId);
+
+		// Also update player state if possible
+		APlayerController* PlayerController = LocalPlayer->GetPlayerController(nullptr);
+		if (PlayerController && PlayerController->PlayerState)
+		{
+			PlayerController->PlayerState->SetUniqueId(NetId);
+		}
+	}
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForLocalPlayerIndex(int32 LocalPlayerIndex) const
+{
+	TObjectPtr<UCommonUserInfo> const* Found = LocalUserInfos.Find(LocalPlayerIndex);
+	if (Found)
+	{
+		return *Found;
+	}
+	return nullptr;
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForPlatformUserIndex(int32 PlatformUserIndex) const
+{
+	FPlatformUserId PlatformUser = GetPlatformUserIdForIndex(PlatformUserIndex);
+	return GetUserInfoForPlatformUser(PlatformUser);
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForPlatformUser(FPlatformUserId PlatformUser) const
+{
+	if (!IsRealPlatformUser(PlatformUser))
+	{
+		return nullptr;
+	}
+
+	for (TPair<int32, UCommonUserInfo*> Pair : LocalUserInfos)
+	{
+		// Don't include guest users in this check
+		if (ensure(Pair.Value) && Pair.Value->PlatformUser == PlatformUser && !Pair.Value->bIsGuest)
+		{
+			return Pair.Value;
+		}
+	}
+
+	return nullptr;
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForUniqueNetId(const FUniqueNetIdRepl& NetId) const
+{
+	if (!NetId.IsValid())
+	{
+		// TODO do we need to handle pre-login case on mobile platforms where netID is invalid?
+		return nullptr;
+	}
+
+	for (TPair<int32, UCommonUserInfo*> UserPair : LocalUserInfos)
+	{
+		if (ensure(UserPair.Value))
+		{
+			for (const TPair<ECommonUserOnlineContext, UCommonUserInfo::FCachedData>& CachedPair : UserPair.Value->CachedDataMap)
+			{
+				if (NetId == CachedPair.Value.CachedNetId)
+				{
+					return UserPair.Value;
+				}
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForControllerId(int32 ControllerId) const
+{
+	FPlatformUserId PlatformUser;
+	FInputDeviceId IgnoreDevice;
+
+	IPlatformInputDeviceMapper::Get().RemapControllerIdToPlatformUserAndDevice(ControllerId, PlatformUser, IgnoreDevice);
+
+	return GetUserInfoForPlatformUser(PlatformUser);
+}
+
+const UCommonUserInfo* UCommonUserSubsystem::GetUserInfoForInputDevice(FInputDeviceId InputDevice) const
+{
+	FPlatformUserId PlatformUser = GetPlatformUserIdForInputDevice(InputDevice);
+	return GetUserInfoForPlatformUser(PlatformUser);
+}
+
+bool UCommonUserSubsystem::IsRealPlatformUserIndex(int32 PlatformUserIndex) const
+{
+	if (PlatformUserIndex < 0)
+	{
+		return false;
+	}
+
+#if COMMONUSER_OSSV1
+	if (PlatformUserIndex >= MAX_LOCAL_PLAYERS)
+	{
+		// Check against OSS count
+		return false;
+	}
+#else
+	// TODO:  OSSv2 define MAX_LOCAL_PLAYERS?
+#endif
+
+	if (PlatformUserIndex > 0 && GetTraitTags().HasTag(FCommonUserTags::Platform_Trait_SingleOnlineUser))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+bool UCommonUserSubsystem::IsRealPlatformUser(FPlatformUserId PlatformUser) const
+{
+	// Validation is done at conversion/allocation time so trust the type
+	if (!PlatformUser.IsValid())
+	{
+		return false;
+	}
+
+	// TODO: Validate against OSS or input mapper somehow
+
+	if (GetTraitTags().HasTag(FCommonUserTags::Platform_Trait_SingleOnlineUser))
+	{
+		// Only the default user is supports online functionality 
+		if (PlatformUser != IPlatformInputDeviceMapper::Get().GetPrimaryPlatformUser())
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+FPlatformUserId UCommonUserSubsystem::GetPlatformUserIdForIndex(int32 PlatformUserIndex) const
+{
+	return IPlatformInputDeviceMapper::Get().GetPlatformUserForUserIndex(PlatformUserIndex);
+}
+
+int32 UCommonUserSubsystem::GetPlatformUserIndexForId(FPlatformUserId PlatformUser) const
+{
+	return IPlatformInputDeviceMapper::Get().GetUserIndexForPlatformUser(PlatformUser);
+}
+
+FPlatformUserId UCommonUserSubsystem::GetPlatformUserIdForInputDevice(FInputDeviceId InputDevice) const
+{
+	return IPlatformInputDeviceMapper::Get().GetUserForInputDevice(InputDevice);
+}
+
+FInputDeviceId UCommonUserSubsystem::GetPrimaryInputDeviceForPlatformUser(FPlatformUserId PlatformUser) const
+{
+	return IPlatformInputDeviceMapper::Get().GetPrimaryInputDeviceForUser(PlatformUser);
+}
+
+void UCommonUserSubsystem::SetTraitTags(const FGameplayTagContainer& InTags)
+{
+	CachedTraitTags = InTags;
+}
+
+bool UCommonUserSubsystem::ShouldWaitForStartInput() const
+{
+	// By default, don't wait for input if this is a single user platform
+	return !HasTraitTag(FCommonUserTags::Platform_Trait_SingleOnlineUser.GetTag());
+}
+
+#if COMMONUSER_OSSV1
+void UCommonUserSubsystem::HandleIdentityLoginStatusChanged(int32 PlatformUserIndex, ELoginStatus::Type OldStatus, ELoginStatus::Type NewStatus, const FUniqueNetId& NewId, ECommonUserOnlineContext Context)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("Player login status changed - System:%s, UserIdx:%d, OldStatus:%s, NewStatus:%s, NewId:%s"),
+		*GetOnlineSubsystemName(Context).ToString(),
+		PlatformUserIndex,
+		ELoginStatus::ToString(OldStatus),
+		ELoginStatus::ToString(NewStatus),
+		*NewId.ToString());
+
+	if (NewStatus == ELoginStatus::NotLoggedIn && OldStatus != ELoginStatus::NotLoggedIn)
+	{
+		FPlatformUserId PlatformUser = GetPlatformUserIdForIndex(PlatformUserIndex);
+		LogOutLocalUser(PlatformUser);
+	}
+}
+
+void UCommonUserSubsystem::HandleControllerPairingChanged(int32 PlatformUserIndex, FControllerPairingChangedUserInfo PreviousUser, FControllerPairingChangedUserInfo NewUser)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("Player controller pairing changed - UserIdx:%d, PreviousUser:%s, NewUser:%s"),
+		PlatformUserIndex,
+		*ToDebugString(PreviousUser),
+		*ToDebugString(NewUser));
+
+	UGameInstance* GameInstance = GetGameInstance();
+	FPlatformUserId PlatformUser = GetPlatformUserIdForIndex(PlatformUserIndex);
+	ULocalPlayer* ControlledLocalPlayer = GameInstance->FindLocalPlayerFromPlatformUserId(PlatformUser);
+	ULocalPlayer* NewLocalPlayer = GameInstance->FindLocalPlayerFromUniqueNetId(NewUser.User);
+	const UCommonUserInfo* NewUserInfo = GetUserInfoForUniqueNetId(FUniqueNetIdRepl(NewUser.User));
+	const UCommonUserInfo* PreviousUserInfo = GetUserInfoForUniqueNetId(FUniqueNetIdRepl(PreviousUser.User));
+
+	// See if we think this is already bound to an existing player	
+	if (PreviousUser.ControllersRemaining == 0 && PreviousUserInfo && PreviousUserInfo != NewUserInfo)
+	{
+		// This means that the user deliberately logged out using a platform interface
+		if (IsRealPlatformUser(PlatformUser))
+		{
+			LogOutLocalUser(PlatformUser);
+		}
+	}
+
+	if (ControlledLocalPlayer && ControlledLocalPlayer != NewLocalPlayer)
+	{
+		// TODO Currently the platforms that call this delegate do not really handle swapping controller IDs
+		// SetLocalPlayerUserIndex(ControlledLocalPlayer, -1);
+	}
+}
+
+void UCommonUserSubsystem::HandleNetworkConnectionStatusChanged(const FString& ServiceName, EOnlineServerConnectionStatus::Type LastConnectionStatus, EOnlineServerConnectionStatus::Type ConnectionStatus, ECommonUserOnlineContext Context)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("HandleNetworkConnectionStatusChanged(ServiceName: %s, LastStatus: %s, ConnectionStatus: %s)"),
+		*ServiceName,
+		EOnlineServerConnectionStatus::ToString(LastConnectionStatus),
+		EOnlineServerConnectionStatus::ToString(ConnectionStatus));
+
+	// Cache old availablity for current users
+	TMap<UCommonUserInfo*, ECommonUserAvailability> AvailabilityMap;
+
+	for (TPair<int32, UCommonUserInfo*> Pair : LocalUserInfos)
+	{
+		AvailabilityMap.Add(Pair.Value, Pair.Value->GetPrivilegeAvailability(ECommonUserPrivilege::CanPlayOnline));
+	}
+
+	FOnlineContextCache* System = GetContextCache(Context);
+	if (ensure(System))
+	{
+		// Service name is normally the same as the OSS name, but not necessarily on all platforms
+		System->CurrentConnectionStatus = ConnectionStatus;
+	}
+
+	for (TPair<UCommonUserInfo*, ECommonUserAvailability> Pair : AvailabilityMap)
+	{
+		// Notify other systems when someone goes online/offline
+		HandleChangedAvailability(Pair.Key, ECommonUserPrivilege::CanPlayOnline, Pair.Value);
+	}
+
+}
+#else
+void UCommonUserSubsystem::HandleAuthLoginStatusChanged(const UE::Online::FAuthLoginStatusChanged& EventParameters, ECommonUserOnlineContext Context)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("Player login status changed - System:%d, UserId:%s, NewStatus:%s"),
+		(int)Context,
+		*ToLogString(EventParameters.AccountInfo->AccountId),
+		LexToString(EventParameters.LoginStatus));
+}
+
+void UCommonUserSubsystem::HandleNetworkConnectionStatusChanged(const UE::Online::FConnectionStatusChanged& EventParameters, ECommonUserOnlineContext Context)
+{
+	UE_LOG(LogCommonUser, Log, TEXT("HandleNetworkConnectionStatusChanged(Context:%d, ServiceName:%s, OldStatus:%s, NewStatus:%s)"),
+		(int)Context,
+		*EventParameters.ServiceName,
+		LexToString(EventParameters.PreviousStatus),
+		LexToString(EventParameters.CurrentStatus));
+
+	// Cache old availablity for current users
+	TMap<UCommonUserInfo*, ECommonUserAvailability> AvailabilityMap;
+
+	for (TPair<int32, UCommonUserInfo*> Pair : LocalUserInfos)
+	{
+		AvailabilityMap.Add(Pair.Value, Pair.Value->GetPrivilegeAvailability(ECommonUserPrivilege::CanPlayOnline));
+	}
+
+	FOnlineContextCache* System = GetContextCache(Context);
+	if (ensure(System))
+	{
+		// Service name is normally the same as the OSS name, but not necessarily on all platforms
+		System->CurrentConnectionStatus = EventParameters.CurrentStatus;
+	}
+
+	for (TPair<UCommonUserInfo*, ECommonUserAvailability> Pair : AvailabilityMap)
+	{
+		// Notify other systems when someone goes online/offline
+		HandleChangedAvailability(Pair.Key, ECommonUserPrivilege::CanPlayOnline, Pair.Value);
+	}
+}
+#endif // COMMONUSER_OSSV1
+
+void UCommonUserSubsystem::HandleInputDeviceConnectionChanged(EInputDeviceConnectionState NewConnectionState, FPlatformUserId PlatformUserId, FInputDeviceId InputDeviceId)
+{
+	FString InputDeviceIDString = FString::Printf(TEXT("%d"), InputDeviceId.GetId());
+	const bool bIsConnected = NewConnectionState == EInputDeviceConnectionState::Connected;
+	UE_LOG(LogCommonUser, Log, TEXT("Controller connection changed - UserIdx:%s, UserID:%s, Connected:%d"), *InputDeviceIDString, *PlatformUserIdToString(PlatformUserId), bIsConnected ? 1 : 0);
+
+	// TODO Implement for platforms that support this
+}
+
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserTypes.cpp b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserTypes.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2fd79ae48b7d0ac772756eb9f8bef38d76fb6c5a
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Private/CommonUserTypes.cpp
@@ -0,0 +1,21 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "CommonUserTypes.h"
+#if COMMONUSER_OSSV1
+#include "OnlineError.h"
+#else
+#include "Online/OnlineErrorDefinitions.h"
+#endif
+
+void FOnlineResultInformation::FromOnlineError(const FOnlineErrorType& InOnlineError)
+{
+#if COMMONUSER_OSSV1
+	bWasSuccessful = InOnlineError.WasSuccessful();
+	ErrorId = InOnlineError.GetErrorCode();
+	ErrorText = InOnlineError.GetErrorMessage();
+#else
+	bWasSuccessful = InOnlineError != UE::Online::Errors::Success();
+	ErrorId = InOnlineError.GetErrorId();
+	ErrorText = InOnlineError.GetText();
+#endif
+}
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/AsyncAction_CommonUserInitialize.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/AsyncAction_CommonUserInitialize.h
new file mode 100644
index 0000000000000000000000000000000000000000..a7167d133561570c45df07314a07bc1e6b14c539
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/AsyncAction_CommonUserInitialize.h
@@ -0,0 +1,68 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CommonUserSubsystem.h"
+#include "Engine/CancellableAsyncAction.h"
+
+#include "AsyncAction_CommonUserInitialize.generated.h"
+
+#define UE_API COMMONUSER_API
+
+enum class ECommonUserOnlineContext : uint8;
+enum class ECommonUserPrivilege : uint8;
+struct FInputDeviceId;
+
+class FText;
+class UObject;
+struct FFrame;
+
+/**
+ * Async action to handle different functions for initializing users
+ */
+UCLASS(MinimalAPI)
+class UAsyncAction_CommonUserInitialize : public UCancellableAsyncAction
+{
+	GENERATED_BODY()
+
+public:
+	/**
+	 * Initializes a local player with the common user system, which includes doing platform-specific login and privilege checks.
+	 * When the process has succeeded or failed, it will broadcast the OnInitializationComplete delegate.
+	 *
+	 * @param LocalPlayerIndex	Desired index of ULocalPlayer in Game Instance, 0 will be primary player and 1+ for local multiplayer
+	 * @param PrimaryInputDevice Primary input device for the user, if invalid will use the system default
+	 * @param bCanUseGuestLogin	If true, this player can be a guest without a real system net id
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser, meta = (BlueprintInternalUseOnly = "true"))
+	static UE_API UAsyncAction_CommonUserInitialize* InitializeForLocalPlay(UCommonUserSubsystem* Target, int32 LocalPlayerIndex, FInputDeviceId PrimaryInputDevice, bool bCanUseGuestLogin);
+
+	/**
+	 * Attempts to log an existing user into the platform-specific online backend to enable full online play
+	 * When the process has succeeded or failed, it will broadcast the OnInitializationComplete delegate.
+	 *
+	 * @param LocalPlayerIndex	Index of existing LocalPlayer in Game Instance
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser, meta = (BlueprintInternalUseOnly = "true"))
+	static UE_API UAsyncAction_CommonUserInitialize* LoginForOnlinePlay(UCommonUserSubsystem* Target, int32 LocalPlayerIndex);
+
+	/** Call when initialization succeeds or fails */
+	UPROPERTY(BlueprintAssignable)
+	FCommonUserOnInitializeCompleteMulticast OnInitializationComplete;
+
+	/** Fail and send callbacks if needed */
+	UE_API void HandleFailure();
+
+	/** Wrapper delegate, will pass on to OnInitializationComplete if appropriate */
+	UFUNCTION()
+	UE_API virtual void HandleInitializationComplete(const UCommonUserInfo* UserInfo, bool bSuccess, FText Error, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext OnlineContext);
+
+protected:
+	/** Actually start the initialization */
+	UE_API virtual void Activate() override;
+
+	TWeakObjectPtr<UCommonUserSubsystem> Subsystem;
+	FCommonUserInitializeParams Params;
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonSessionSubsystem.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonSessionSubsystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..19dbd520301ed8a503cbb4add84398a898b1da77
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonSessionSubsystem.h
@@ -0,0 +1,485 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CommonUserTypes.h"
+#include "Subsystems/GameInstanceSubsystem.h"
+#include "UObject/ObjectPtr.h"
+#include "UObject/StrongObjectPtr.h"
+#include "UObject/PrimaryAssetId.h"
+#include "UObject/WeakObjectPtr.h"
+#include "PartyBeaconClient.h"
+#include "PartyBeaconHost.h"
+#include "PartyBeaconState.h"
+#if! COMMONUSER_OSSV1
+#include "Online/Sessions.h"
+#endif
+
+
+
+class APlayerController;
+class AOnlineBeaconHost;
+class ULocalPlayer;
+namespace ETravelFailure { enum Type : int; }
+struct FOnlineResultInformation;
+
+#if COMMONUSER_OSSV1
+#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionSettings.h"
+#else
+#include "Online/Lobbies.h"
+#include "Online/OnlineAsyncOpHandle.h"
+#endif // COMMONUSER_OSSV1
+
+#include "CommonSessionSubsystem.generated.h"
+
+class UWorld;
+class FCommonSession_OnlineSessionSettings;
+
+#if COMMONUSER_OSSV1
+class FCommonOnlineSearchSettingsOSSv1;
+using FCommonOnlineSearchSettings = FCommonOnlineSearchSettingsOSSv1;
+#else
+class FCommonOnlineSearchSettingsOSSv2;
+using FCommonOnlineSearchSettings = FCommonOnlineSearchSettingsOSSv2;
+#endif // COMMONUSER_OSSV1
+
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSession_HostSessionRequest
+
+/** Specifies the online features and connectivity that should be used for a game session */
+UENUM(BlueprintType)
+enum class ECommonSessionOnlineMode : uint8
+{
+	Offline,
+	LAN,
+	Online
+};
+
+/** A request object that stores the parameters used when hosting a gameplay session */
+UCLASS(MinimalAPI, BlueprintType)
+class UCommonSession_HostSessionRequest : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	/** Indicates if the session is a full online session or a different type */
+	UPROPERTY(BlueprintReadWrite, Category=Session)
+	ECommonSessionOnlineMode OnlineMode;
+
+	/** True if this request should create a player-hosted lobbies if available */
+	UPROPERTY(BlueprintReadWrite, Category = Session)
+	bool bUseLobbies;
+
+	/** True if this request should create a lobby with enabled voice chat in available */
+	UPROPERTY(BlueprintReadWrite, Category = Session)
+	bool bUseLobbiesVoiceChat;
+
+	/** True if this request should create a session that will appear in the user's presence information */
+	UPROPERTY(BlueprintReadWrite, Category = Session)
+	bool bUsePresence;
+
+	/** String used during matchmaking to specify what type of game mode this is */
+	UPROPERTY(BlueprintReadWrite, Category=Session)
+	FString ModeNameForAdvertisement;
+
+	/** The map that will be loaded at the start of gameplay, this needs to be a valid Primary Asset top-level map */
+	UPROPERTY(BlueprintReadWrite, Category=Session, meta=(AllowedTypes="World"))
+	FPrimaryAssetId MapID;
+
+	/** Extra arguments passed as URL options to the game */
+	UPROPERTY(BlueprintReadWrite, Category=Session)
+	TMap<FString, FString> ExtraArgs;
+
+	/** Maximum players allowed per gameplay session */
+	UPROPERTY(BlueprintReadWrite, Category=Session)
+	int32 MaxPlayerCount = 16;
+
+public:
+	/** Returns the maximum players that should actually be used, could be overridden in child classes */
+	COMMONUSER_API virtual int32 GetMaxPlayers() const;
+
+	/** Returns the full map name that will be used during gameplay */
+	COMMONUSER_API virtual FString GetMapName() const;
+
+	/** Constructs the full URL that will be passed to ServerTravel */
+	COMMONUSER_API virtual FString ConstructTravelURL() const;
+
+	/** Returns true if this request is valid, returns false and logs errors if it is not */
+	COMMONUSER_API virtual bool ValidateAndLogErrors(FText& OutError) const;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSession_SearchResult
+
+/** A result object returned from the online system that describes a joinable game session */
+UCLASS(MinimalAPI, BlueprintType)
+class UCommonSession_SearchResult : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	/** Returns an internal description of the session, not meant to be human readable */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API FString GetDescription() const;
+
+	/** Gets an arbitrary string setting, bFoundValue will be false if the setting does not exist */
+	UFUNCTION(BlueprintPure, Category=Sessions)
+	COMMONUSER_API void GetStringSetting(FName Key, FString& Value, bool& bFoundValue) const;
+
+	/** Gets an arbitrary integer setting, bFoundValue will be false if the setting does not exist */
+	UFUNCTION(BlueprintPure, Category = Sessions)
+	COMMONUSER_API void GetIntSetting(FName Key, int32& Value, bool& bFoundValue) const;
+
+	/** The number of private connections that are available */
+	UFUNCTION(BlueprintPure, Category=Sessions)
+	COMMONUSER_API int32 GetNumOpenPrivateConnections() const;
+
+	/** The number of publicly available connections that are available */
+	UFUNCTION(BlueprintPure, Category=Sessions)
+	COMMONUSER_API int32 GetNumOpenPublicConnections() const;
+
+	/** The maximum number of publicly available connections that could be available, including already filled connections */
+	UFUNCTION(BlueprintPure, Category = Sessions)
+	COMMONUSER_API int32 GetMaxPublicConnections() const;
+
+	/** Ping to the search result, MAX_QUERY_PING is unreachable */
+	UFUNCTION(BlueprintPure, Category=Sessions)
+	COMMONUSER_API int32 GetPingInMs() const;
+
+public:
+	/** Pointer to the platform-specific implementation */
+#if COMMONUSER_OSSV1
+	FOnlineSessionSearchResult Result;
+#else
+	TSharedPtr<const UE::Online::FLobby> Lobby;
+
+	UE::Online::FOnlineSessionId SessionID;
+#endif // COMMONUSER_OSSV1
+
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSession_SearchSessionRequest
+
+/** Delegates called when a session search completes */
+DECLARE_MULTICAST_DELEGATE_TwoParams(FCommonSession_FindSessionsFinished, bool bSucceeded, const FText& ErrorMessage);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FCommonSession_FindSessionsFinishedDynamic, bool, bSucceeded, FText, ErrorMessage);
+
+/** Request object describing a session search, this object will be updated once the search has completed */
+UCLASS(MinimalAPI, BlueprintType)
+class UCommonSession_SearchSessionRequest : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	/** Indicates if the this is looking for full online games or a different type like LAN */
+	UPROPERTY(BlueprintReadWrite, Category = Session)
+	ECommonSessionOnlineMode OnlineMode;
+
+	/** True if this request should look for player-hosted lobbies if they are available, false will only search for registered server sessions */
+	UPROPERTY(BlueprintReadWrite, Category = Session)
+	bool bUseLobbies;
+
+	/** List of all found sessions, will be valid when OnSearchFinished is called */
+	UPROPERTY(BlueprintReadOnly, Category=Session)
+	TArray<TObjectPtr<UCommonSession_SearchResult>> Results;
+
+	/** Native Delegate called when a session search completes */
+	FCommonSession_FindSessionsFinished OnSearchFinished;
+
+	/** Called by subsystem to execute finished delegates */
+	COMMONUSER_API void NotifySearchFinished(bool bSucceeded, const FText& ErrorMessage);
+
+private:
+	/** Delegate called when a session search completes */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On Search Finished", AllowPrivateAccess = true))
+	FCommonSession_FindSessionsFinishedDynamic K2_OnSearchFinished;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// CommonSessionSubsystem Events
+
+/**
+ * Event triggered when the local user has requested to join a session from an external source, for example from a platform overlay.
+ * Generally, the game should transition the player into the session.
+ * @param LocalPlatformUserId the local user id that accepted the invitation. This is a platform user id because the user might not be signed in yet.
+ * @param RequestedSession the requested session. Can be null if there was an error processing the request.
+ * @param RequestedSessionResult result of the requested session processing
+ */
+DECLARE_MULTICAST_DELEGATE_ThreeParams(FCommonSessionOnUserRequestedSession, const FPlatformUserId& /*LocalPlatformUserId*/, UCommonSession_SearchResult* /*RequestedSession*/, const FOnlineResultInformation& /*RequestedSessionResult*/);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FCommonSessionOnUserRequestedSession_Dynamic, const FPlatformUserId&, LocalPlatformUserId, UCommonSession_SearchResult*, RequestedSession, const FOnlineResultInformation&, RequestedSessionResult);
+
+/**
+ * Event triggered when a session join has completed, after joining the underlying session and before traveling to the server if it was successful.
+ * The event parameters indicate if this was successful, or if there was an error that will stop it from traveling.
+ * @param Result result of the session join
+ */
+DECLARE_MULTICAST_DELEGATE_OneParam(FCommonSessionOnJoinSessionComplete, const FOnlineResultInformation& /*Result*/);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCommonSessionOnJoinSessionComplete_Dynamic, const FOnlineResultInformation&, Result);
+
+/**
+ * Event triggered when a session creation for hosting has completed, right before it travels to the map.
+ * The event parameters indicate if this was successful, or if there was an error that will stop it from traveling.
+ * @param Result result of the session join
+ */
+DECLARE_MULTICAST_DELEGATE_OneParam(FCommonSessionOnCreateSessionComplete, const FOnlineResultInformation& /*Result*/);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCommonSessionOnCreateSessionComplete_Dynamic, const FOnlineResultInformation&, Result);
+
+/**
+ * Event triggered when the local user has requested to destroy a session from an external source, for example from a platform overlay.
+ * The game should transition the player out of the session.
+ * @param LocalPlatformUserId the local user id that made the destroy request. This is a platform user id because the user might not be signed in yet.
+ * @param SessionName the name identifier for the session.
+ */
+DECLARE_MULTICAST_DELEGATE_TwoParams(FCommonSessionOnDestroySessionRequested, const FPlatformUserId& /*LocalPlatformUserId*/, const FName& /*SessionName*/);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FCommonSessionOnDestroySessionRequested_Dynamic, const FPlatformUserId&, LocalPlatformUserId, const FName&, SessionName);
+
+/**
+ * Event triggered when a session join has completed, after resolving the connect string and prior to the client traveling.
+ * @param URL resolved connection string for the session with any additional arguments
+ */
+DECLARE_MULTICAST_DELEGATE_OneParam(FCommonSessionOnPreClientTravel, FString& /*URL*/);
+
+/**
+ * Event triggered at different points in the session ecosystem that represent a user-presentable state of the session.
+ * This should not be used for online functionality (use OnCreateSessionComplete or OnJoinSessionComplete for those) but for features such as rich presence
+ */
+UENUM(BlueprintType)
+enum class ECommonSessionInformationState : uint8
+{
+	OutOfGame,
+	Matchmaking,
+	InGame
+};
+DECLARE_MULTICAST_DELEGATE_ThreeParams(FCommonSessionOnSessionInformationChanged, ECommonSessionInformationState /*SessionStatus*/, const FString& /*GameMode*/, const FString& /*MapName*/);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FCommonSessionOnSessionInformationChanged_Dynamic, ECommonSessionInformationState, SessionStatus, const FString&, GameMode, const FString&, MapName);
+
+//////////////////////////////////////////////////////////////////////
+// UCommonSessionSubsystem
+
+/** 
+ * Game subsystem that handles requests for hosting and joining online games.
+ * One subsystem is created for each game instance and can be accessed from blueprints or C++ code.
+ * If a game-specific subclass exists, this base subsystem will not be created.
+ */
+UCLASS(MinimalAPI, BlueprintType, Config=Engine)
+class UCommonSessionSubsystem : public UGameInstanceSubsystem
+{
+	GENERATED_BODY()
+
+public:
+	UCommonSessionSubsystem() { }
+
+	COMMONUSER_API virtual void Initialize(FSubsystemCollectionBase& Collection) override;
+	COMMONUSER_API virtual void Deinitialize() override;
+	COMMONUSER_API virtual bool ShouldCreateSubsystem(UObject* Outer) const override;
+
+	/** Creates a host session request with default options for online games, this can be modified after creation */
+	UFUNCTION(BlueprintCallable, Category = Session)
+	COMMONUSER_API virtual UCommonSession_HostSessionRequest* CreateOnlineHostSessionRequest();
+
+	/** Creates a session search object with default options to look for default online games, this can be modified after creation */
+	UFUNCTION(BlueprintCallable, Category = Session)
+	COMMONUSER_API virtual UCommonSession_SearchSessionRequest* CreateOnlineSearchSessionRequest();
+
+	/** Creates a new online game using the session request information, if successful this will start a hard map transfer */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API virtual void HostSession(APlayerController* HostingPlayer, UCommonSession_HostSessionRequest* Request);
+
+	/** Starts a process to look for existing sessions or create a new one if no viable sessions are found */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API virtual void QuickPlaySession(APlayerController* JoiningOrHostingPlayer, UCommonSession_HostSessionRequest* Request);
+
+	/** Starts process to join an existing session, if successful this will connect to the specified server */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API virtual void JoinSession(APlayerController* JoiningPlayer, UCommonSession_SearchResult* Request);
+
+	/** Queries online system for the list of joinable sessions matching the search request */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API virtual void FindSessions(APlayerController* SearchingPlayer, UCommonSession_SearchSessionRequest* Request);
+
+	/** Clean up any active sessions, called from cases like returning to the main menu */
+	UFUNCTION(BlueprintCallable, Category=Session)
+	COMMONUSER_API virtual void CleanUpSessions();
+
+	//////////////////////////////////////////////////////////////////////
+	// Events
+
+	/** Native Delegate when a local user has accepted an invite */
+	FCommonSessionOnUserRequestedSession OnUserRequestedSessionEvent;
+	/** Event broadcast when a local user has accepted an invite */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On User Requested Session"))
+	FCommonSessionOnUserRequestedSession_Dynamic K2_OnUserRequestedSessionEvent;
+
+	/** Native Delegate when a JoinSession call has completed */
+	FCommonSessionOnJoinSessionComplete OnJoinSessionCompleteEvent;
+	/** Event broadcast when a JoinSession call has completed */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On Join Session Complete"))
+	FCommonSessionOnJoinSessionComplete_Dynamic K2_OnJoinSessionCompleteEvent;
+
+	/** Native Delegate when a CreateSession call has completed */
+	FCommonSessionOnCreateSessionComplete OnCreateSessionCompleteEvent;
+	/** Event broadcast when a CreateSession call has completed */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On Create Session Complete"))
+	FCommonSessionOnCreateSessionComplete_Dynamic K2_OnCreateSessionCompleteEvent;
+
+	/** Native Delegate when the presentable session information has changed */
+	FCommonSessionOnSessionInformationChanged OnSessionInformationChangedEvent;
+	/** Event broadcast when the presentable session information has changed */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On Session Information Changed"))
+	FCommonSessionOnSessionInformationChanged_Dynamic K2_OnSessionInformationChangedEvent;
+
+	/** Native Delegate when a platform session destroy has been requested */
+	FCommonSessionOnDestroySessionRequested OnDestroySessionRequestedEvent;
+	/** Event broadcast when a platform session destroy has been requested */
+	UPROPERTY(BlueprintAssignable, Category = "Events", meta = (DisplayName = "On Leave Session Requested"))
+	FCommonSessionOnDestroySessionRequested_Dynamic K2_OnDestroySessionRequestedEvent;
+
+	/** Native Delegate for modifying the connect URL prior to a client travel */
+	FCommonSessionOnPreClientTravel OnPreClientTravelEvent;
+
+	// Config settings, these can overridden in child classes or config files
+
+	/** Sets the default value of bUseLobbies for session search and host requests */
+	UPROPERTY(Config)
+	bool bUseLobbiesDefault = true;
+
+	/** Sets the default value of bUseLobbiesVoiceChat for session host requests */
+	UPROPERTY(Config)
+	bool bUseLobbiesVoiceChatDefault = false;
+
+	/** Enables reservation beacon flow prior to server travel when creating or joining a game session */ 
+	UPROPERTY(Config)
+	bool bUseBeacons = true;
+
+protected:
+	// Functions called during the process of creating or joining a session, these can be overidden for game-specific behavior
+
+	/** Called to fill in a session request from quick play host settings, can be overridden for game-specific behavior */
+	COMMONUSER_API virtual TSharedRef<FCommonOnlineSearchSettings> CreateQuickPlaySearchSettings(UCommonSession_HostSessionRequest* Request, UCommonSession_SearchSessionRequest* QuickPlayRequest);
+
+	/** Called when a quick play search finishes, can be overridden for game-specific behavior */
+	COMMONUSER_API virtual void HandleQuickPlaySearchFinished(bool bSucceeded, const FText& ErrorMessage, TWeakObjectPtr<APlayerController> JoiningOrHostingPlayer, TStrongObjectPtr<UCommonSession_HostSessionRequest> HostRequest);
+
+	/** Called when traveling to a session fails */
+	COMMONUSER_API virtual void TravelLocalSessionFailure(UWorld* World, ETravelFailure::Type FailureType, const FString& ReasonString);
+
+	/** Called when a new session is either created or fails to be created */
+	COMMONUSER_API virtual void OnCreateSessionComplete(FName SessionName, bool bWasSuccessful);
+
+	/** Called to finalize session creation */
+	COMMONUSER_API virtual void FinishSessionCreation(bool bWasSuccessful);
+
+	/** Called after traveling to the new hosted session map */
+	COMMONUSER_API virtual void HandlePostLoadMap(UWorld* World);
+
+protected:
+	// Internal functions for initializing and handling results from the online systems
+
+	COMMONUSER_API void BindOnlineDelegates();
+	COMMONUSER_API void CreateOnlineSessionInternal(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request);
+	COMMONUSER_API void FindSessionsInternal(APlayerController* SearchingPlayer, const TSharedRef<FCommonOnlineSearchSettings>& InSearchSettings);
+	COMMONUSER_API void JoinSessionInternal(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request);
+	COMMONUSER_API void InternalTravelToSession(const FName SessionName);
+	COMMONUSER_API void NotifyUserRequestedSession(const FPlatformUserId& PlatformUserId, UCommonSession_SearchResult* RequestedSession, const FOnlineResultInformation& RequestedSessionResult);
+	COMMONUSER_API void NotifyJoinSessionComplete(const FOnlineResultInformation& Result);
+	COMMONUSER_API void NotifyCreateSessionComplete(const FOnlineResultInformation& Result);
+	COMMONUSER_API void NotifySessionInformationUpdated(ECommonSessionInformationState SessionStatusStr, const FString& GameMode = FString(), const FString& MapName = FString());
+	COMMONUSER_API void NotifyDestroySessionRequested(const FPlatformUserId& PlatformUserId, const FName& SessionName);
+	COMMONUSER_API void SetCreateSessionError(const FText& ErrorText);
+
+#if COMMONUSER_OSSV1
+	COMMONUSER_API void BindOnlineDelegatesOSSv1();
+	COMMONUSER_API void CreateOnlineSessionInternalOSSv1(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request);
+	COMMONUSER_API void FindSessionsInternalOSSv1(ULocalPlayer* LocalPlayer);
+	COMMONUSER_API void JoinSessionInternalOSSv1(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request);
+	COMMONUSER_API TSharedRef<FCommonOnlineSearchSettings> CreateQuickPlaySearchSettingsOSSv1(UCommonSession_HostSessionRequest* Request, UCommonSession_SearchSessionRequest* QuickPlayRequest);
+	COMMONUSER_API void CleanUpSessionsOSSv1();
+
+	COMMONUSER_API void HandleSessionFailure(const FUniqueNetId& NetId, ESessionFailure::Type FailureType);
+	COMMONUSER_API void HandleSessionUserInviteAccepted(const bool bWasSuccessful, const int32 LocalUserIndex, FUniqueNetIdPtr AcceptingUserId, const FOnlineSessionSearchResult& SearchResult);
+	COMMONUSER_API void OnStartSessionComplete(FName SessionName, bool bWasSuccessful);
+	COMMONUSER_API void OnRegisterLocalPlayerComplete_CreateSession(const FUniqueNetId& PlayerId, EOnJoinSessionCompleteResult::Type Result);
+	COMMONUSER_API void OnUpdateSessionComplete(FName SessionName, bool bWasSuccessful);
+	COMMONUSER_API void OnEndSessionComplete(FName SessionName, bool bWasSuccessful);
+	COMMONUSER_API void OnDestroySessionComplete(FName SessionName, bool bWasSuccessful);
+	COMMONUSER_API void OnDestroySessionRequested(int32 LocalUserNum, FName SessionName);
+	COMMONUSER_API void OnFindSessionsComplete(bool bWasSuccessful);
+	COMMONUSER_API void OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result);
+	COMMONUSER_API void OnRegisterJoiningLocalPlayerComplete(const FUniqueNetId& PlayerId, EOnJoinSessionCompleteResult::Type Result);
+	COMMONUSER_API void FinishJoinSession(EOnJoinSessionCompleteResult::Type Result);
+
+#else
+	COMMONUSER_API void BindOnlineDelegatesOSSv2();
+	COMMONUSER_API void CreateOnlineSessionInternalOSSv2(ULocalPlayer* LocalPlayer, UCommonSession_HostSessionRequest* Request);
+	COMMONUSER_API void FindSessionsInternalOSSv2(ULocalPlayer* LocalPlayer);
+	COMMONUSER_API void JoinSessionInternalOSSv2(ULocalPlayer* LocalPlayer, UCommonSession_SearchResult* Request);
+	COMMONUSER_API TSharedRef<FCommonOnlineSearchSettings> CreateQuickPlaySearchSettingsOSSv2(UCommonSession_HostSessionRequest* HostRequest, UCommonSession_SearchSessionRequest* SearchRequest);
+	COMMONUSER_API void CleanUpSessionsOSSv2();
+
+	/** Process a join request originating from the online service */
+	COMMONUSER_API void OnLobbyJoinRequested(const UE::Online::FUILobbyJoinRequested& EventParams);
+
+	/** Process a SESSION join request originating from the online service */
+	COMMONUSER_API void OnSessionJoinRequested(const UE::Online::FUISessionJoinRequested& EventParams);
+
+	/** Get the local user id for a given controller */
+	COMMONUSER_API UE::Online::FAccountId GetAccountId(APlayerController* PlayerController) const;
+	/** Get the lobby id for a given session name */
+	COMMONUSER_API UE::Online::FLobbyId GetLobbyId(const FName SessionName) const;
+	/** Event handle for UI lobby join requested */
+	UE::Online::FOnlineEventDelegateHandle LobbyJoinRequestedHandle;
+
+	/** Event handle for UI lobby session requested */
+	UE::Online::FOnlineEventDelegateHandle SessionJoinRequestedHandle;
+
+#endif // COMMONUSER_OSSV1
+
+	COMMONUSER_API void CreateHostReservationBeacon();
+	COMMONUSER_API void ConnectToHostReservationBeacon();
+	COMMONUSER_API void DestroyHostReservationBeacon();
+
+protected:
+	/** The travel URL that will be used after session operations are complete */
+	FString PendingTravelURL;
+
+	/** Most recent result information for a session creation attempt, stored here to allow storing error codes for later */
+	FOnlineResultInformation CreateSessionResult;
+
+	/** True if we want to cancel the session after it is created */
+	bool bWantToDestroyPendingSession = false;
+
+	/** True if this is a dedicated server, which doesn't require a LocalPlayer to create a session */
+	bool bIsDedicatedServer = false;
+
+	/** Settings for the current search */
+	TSharedPtr<FCommonOnlineSearchSettings> SearchSettings;
+
+	/** General beacon listener for registering beacons with */
+	UPROPERTY(Transient)
+	TWeakObjectPtr<AOnlineBeaconHost> BeaconHostListener;
+	/** State of the beacon host */
+	UPROPERTY(Transient)
+	TObjectPtr<UPartyBeaconState> ReservationBeaconHostState;
+	/** Beacon controlling access to this game. */
+	UPROPERTY(Transient)
+	TWeakObjectPtr<APartyBeaconHost> ReservationBeaconHost;
+	/** Common class object for beacon communication */
+	UPROPERTY(Transient)
+	TWeakObjectPtr<APartyBeaconClient> ReservationBeaconClient;
+
+	/** Number of teams for beacon reservation */
+	UPROPERTY(Config)
+	int32 BeaconTeamCount = 2;
+	/** Size of a team for beacon reservation */
+	UPROPERTY(Config)
+	int32 BeaconTeamSize = 8;
+	/** Max number of beacon reservations */
+	UPROPERTY(Config)
+	int32 BeaconMaxReservations = 16;
+};
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserBasicPresence.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserBasicPresence.h
new file mode 100644
index 0000000000000000000000000000000000000000..7e7598818f42b597c67f74bb9bb0252256541196
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserBasicPresence.h
@@ -0,0 +1,63 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "Subsystems/GameInstanceSubsystem.h"
+#include "CommonUserBasicPresence.generated.h"
+
+#define UE_API COMMONUSER_API
+
+class UCommonSessionSubsystem;
+enum class ECommonSessionInformationState : uint8;
+
+//////////////////////////////////////////////////////////////////////
+// UCommonUserBasicPresence
+
+/**
+ * This subsystem plugs into the session subsystem and pushes its information to the presence interface.
+ * It is not intended to be a full featured rich presence implementation, but can be used as a proof-of-concept
+ * for pushing information from the session subsystem to the presence system
+ */
+UCLASS(MinimalAPI, BlueprintType, Config = Engine)
+class UCommonUserBasicPresence : public UGameInstanceSubsystem
+{
+	GENERATED_BODY()
+
+public:
+	UE_API UCommonUserBasicPresence();
+
+
+	/** Implement this for initialization of instances of the system */
+	UE_API virtual void Initialize(FSubsystemCollectionBase& Collection) override;
+
+	/** Implement this for deinitialization of instances of the system */
+	UE_API virtual void Deinitialize() override;
+
+	/** False is a general purpose killswitch to stop this class from pushing presence*/
+	UPROPERTY(Config)
+	bool bEnableSessionsBasedPresence = false;
+
+	/** Maps the presence status "In-game" to a backend key*/
+	UPROPERTY(Config)
+	FString PresenceStatusInGame;
+
+	/** Maps the presence status "Main Menu" to a backend key*/
+	UPROPERTY(Config)
+	FString PresenceStatusMainMenu;
+
+	/** Maps the presence status "Matchmaking" to a backend key*/
+	UPROPERTY(Config)
+	FString PresenceStatusMatchmaking;
+
+	/** Maps the "Game Mode" rich presence entry to a backend key*/
+	UPROPERTY(Config)
+	FString PresenceKeyGameMode;
+
+	/** Maps the "Map Name" rich presence entry to a backend key*/
+	UPROPERTY(Config)
+	FString PresenceKeyMapName;
+
+	UE_API void OnNotifySessionInformationChanged(ECommonSessionInformationState SessionStatus, const FString& GameMode, const FString& MapName);
+	UE_API FString SessionStateToBackendKey(ECommonSessionInformationState SessionStatus);
+};
+
+#undef UE_API
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserModule.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserModule.h
new file mode 100644
index 0000000000000000000000000000000000000000..64c551192c93405dfdd27732adc3a08b19fd4c70
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserModule.h
@@ -0,0 +1,14 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Modules/ModuleInterface.h"
+
+class FCommonUserModule : public IModuleInterface
+{
+public:
+
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+};
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserSubsystem.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserSubsystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..abfcfca6bf9c71a5bba9d63131e18cf7593ef8c1
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserSubsystem.h
@@ -0,0 +1,649 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CommonUserTypes.h"
+#include "Engine/GameViewportClient.h"
+#include "GameFramework/OnlineReplStructs.h"
+#include "Subsystems/GameInstanceSubsystem.h"
+#include "UObject/WeakObjectPtr.h"
+#include "GameplayTagContainer.h"
+#include "CommonUserSubsystem.generated.h"
+
+#if COMMONUSER_OSSV1
+#include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineError.h"
+#else
+#include "Online/OnlineAsyncOpHandle.h"
+#endif
+
+class FNativeGameplayTag;
+class IOnlineSubsystem;
+
+/** List of tags used by the common user subsystem */
+struct FCommonUserTags
+{
+	// General severity levels and specific system messages
+
+	static COMMONUSER_API FNativeGameplayTag SystemMessage_Error;	// SystemMessage.Error
+	static COMMONUSER_API FNativeGameplayTag SystemMessage_Warning; // SystemMessage.Warning
+	static COMMONUSER_API FNativeGameplayTag SystemMessage_Display; // SystemMessage.Display
+
+	/** All attempts to initialize a player failed, user has to do something before trying again */
+	static COMMONUSER_API FNativeGameplayTag SystemMessage_Error_InitializeLocalPlayerFailed; // SystemMessage.Error.InitializeLocalPlayerFailed
+
+
+	// Platform trait tags, it is expected that the game instance or other system calls SetTraitTags with these tags for the appropriate platform
+
+	/** This tag means it is a console platform that directly maps controller IDs to different system users. If false, the same user can have multiple controllers */
+	static COMMONUSER_API FNativeGameplayTag Platform_Trait_RequiresStrictControllerMapping; // Platform.Trait.RequiresStrictControllerMapping
+
+	/** This tag means the platform has a single online user and all players use index 0 */
+	static COMMONUSER_API FNativeGameplayTag Platform_Trait_SingleOnlineUser; // Platform.Trait.SingleOnlineUser
+};
+
+/** Logical representation of an individual user, one of these will exist for all initialized local players */
+UCLASS(MinimalAPI, BlueprintType)
+class UCommonUserInfo : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	/** Primary controller input device for this user, they could also have additional secondary devices */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	FInputDeviceId PrimaryInputDevice;
+
+	/** Specifies the logical user on the local platform, guest users will point to the primary user */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	FPlatformUserId PlatformUser;
+	
+	/** If this user is assigned a LocalPlayer, this will match the index in the GameInstance localplayers array once it is fully created */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	int32 LocalPlayerIndex = -1;
+
+	/** If true, this user is allowed to be a guest */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	bool bCanBeGuest = false;
+
+	/** If true, this is a guest user attached to primary user 0 */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	bool bIsGuest = false;
+
+	/** Overall state of the user's initialization process */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	ECommonUserInitializationState InitializationState = ECommonUserInitializationState::Invalid;
+
+	/** Returns true if this user has successfully logged in */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API bool IsLoggedIn() const;
+
+	/** Returns true if this user is in the middle of logging in */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API bool IsDoingLogin() const;
+
+	/** Returns the most recently queries result for a specific privilege, will return unknown if never queried */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API ECommonUserPrivilegeResult GetCachedPrivilegeResult(ECommonUserPrivilege Privilege, ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Ask about the general availability of a feature, this combines cached results with state */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API ECommonUserAvailability GetPrivilegeAvailability(ECommonUserPrivilege Privilege) const;
+
+	/** Returns the net id for the given context */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API FUniqueNetIdRepl GetNetId(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the user's human readable nickname, this will return the value that was cached during UpdateCachedNetId or SetNickname */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API FString GetNickname(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Modify the user's human readable nickname, this can be used when setting up multiple guests but will get overwritten with the platform nickname for real users */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API void SetNickname(const FString& NewNickname, ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game);
+
+	/** Returns an internal debug string for this player */
+	UFUNCTION(BlueprintCallable, Category = UserInfo)
+	COMMONUSER_API FString GetDebugString() const;
+
+	/** Accessor for platform user id */
+	COMMONUSER_API FPlatformUserId GetPlatformUserId() const;
+
+	/** Gets the platform user index for older functions expecting an integer */
+	COMMONUSER_API int32 GetPlatformUserIndex() const;
+
+	// Internal data, only intended to be accessed by online subsystems
+
+	/** Cached data for each online system */
+	struct FCachedData
+	{
+		/** Cached net id per system */
+		FUniqueNetIdRepl CachedNetId;
+
+		/** Cached nickanem, updated whenever net ID might change */
+		FString CachedNickname;
+
+		/** Cached values of various user privileges */
+		TMap<ECommonUserPrivilege, ECommonUserPrivilegeResult> CachedPrivileges;
+	};
+
+	/** Per context cache, game will always exist but others may not */
+	TMap<ECommonUserOnlineContext, FCachedData> CachedDataMap;
+	
+	/** Looks up cached data using resolution rules */
+	COMMONUSER_API FCachedData* GetCachedData(ECommonUserOnlineContext Context);
+	COMMONUSER_API const FCachedData* GetCachedData(ECommonUserOnlineContext Context) const;
+
+	/** Updates cached privilege results, will propagate to game if needed */
+	COMMONUSER_API void UpdateCachedPrivilegeResult(ECommonUserPrivilege Privilege, ECommonUserPrivilegeResult Result, ECommonUserOnlineContext Context);
+
+	/** Updates cached privilege results, will propagate to game if needed */
+	COMMONUSER_API void UpdateCachedNetId(const FUniqueNetIdRepl& NewId, ECommonUserOnlineContext Context);
+
+	/** Return the subsystem this is owned by */
+	COMMONUSER_API class UCommonUserSubsystem* GetSubsystem() const;
+};
+
+
+/** Delegates when initialization processes succeed or fail */
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_FiveParams(FCommonUserOnInitializeCompleteMulticast, const UCommonUserInfo*, UserInfo, bool, bSuccess, FText, Error, ECommonUserPrivilege, RequestedPrivilege, ECommonUserOnlineContext, OnlineContext);
+DECLARE_DYNAMIC_DELEGATE_FiveParams(FCommonUserOnInitializeComplete, const UCommonUserInfo*, UserInfo, bool, bSuccess, FText, Error, ECommonUserPrivilege, RequestedPrivilege, ECommonUserOnlineContext, OnlineContext);
+
+/** Delegate when a system error message is sent, the game can choose to display it to the user using the type tag */
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FCommonUserHandleSystemMessageDelegate, FGameplayTag, MessageType, FText, TitleText, FText, BodyText);
+
+/** Delegate when a privilege changes, this can be bound to see if online status/etc changes during gameplay */
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FCommonUserAvailabilityChangedDelegate, const UCommonUserInfo*, UserInfo, ECommonUserPrivilege, Privilege, ECommonUserAvailability, OldAvailability, ECommonUserAvailability, NewAvailability);
+
+
+/** Parameter struct for initialize functions, this would normally be filled in by wrapper functions like async nodes */
+USTRUCT(BlueprintType)
+struct FCommonUserInitializeParams
+{
+	GENERATED_BODY()
+	
+	/** What local player index to use, can specify one above current if can create player is enabled */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	int32 LocalPlayerIndex = 0;
+
+	/** Deprecated method of selecting platform user and input device */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	int32 ControllerId = -1;
+
+	/** Primary controller input device for this user, they could also have additional secondary devices */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	FInputDeviceId PrimaryInputDevice;
+
+	/** Specifies the logical user on the local platform */
+	UPROPERTY(BlueprintReadOnly, Category = UserInfo)
+	FPlatformUserId PlatformUser;
+	
+	/** Generally either CanPlay or CanPlayOnline, specifies what level of privilege is required */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	ECommonUserPrivilege RequestedPrivilege = ECommonUserPrivilege::CanPlay;
+
+	/** What specific online context to log in to, game means to login to all relevant ones */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	ECommonUserOnlineContext OnlineContext = ECommonUserOnlineContext::Game;
+
+	/** True if this is allowed to create a new local player for initial login */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	bool bCanCreateNewLocalPlayer = false;
+
+	/** True if this player can be a guest user without an actual online presence */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	bool bCanUseGuestLogin = false;
+
+	/** True if we should not show login errors, the game will be responsible for displaying them */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	bool bSuppressLoginErrors = false;
+
+	/** If bound, call this dynamic delegate at completion of login */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Default)
+	FCommonUserOnInitializeComplete OnUserInitializeComplete;
+};
+
+/**
+ * Game subsystem that handles queries and changes to user identity and login status.
+ * One subsystem is created for each game instance and can be accessed from blueprints or C++ code.
+ * If a game-specific subclass exists, this base subsystem will not be created.
+ */
+UCLASS(MinimalAPI, BlueprintType, Config=Engine)
+class UCommonUserSubsystem : public UGameInstanceSubsystem
+{
+	GENERATED_BODY()
+
+public:
+	UCommonUserSubsystem() { }
+
+	COMMONUSER_API virtual void Initialize(FSubsystemCollectionBase& Collection) override;
+	COMMONUSER_API virtual void Deinitialize() override;
+	COMMONUSER_API virtual bool ShouldCreateSubsystem(UObject* Outer) const override;
+
+
+	/** BP delegate called when any requested initialization request completes */
+	UPROPERTY(BlueprintAssignable, Category = CommonUser)
+	FCommonUserOnInitializeCompleteMulticast OnUserInitializeComplete;
+
+	/** BP delegate called when the system sends an error/warning message */
+	UPROPERTY(BlueprintAssignable, Category = CommonUser)
+	FCommonUserHandleSystemMessageDelegate OnHandleSystemMessage;
+
+	/** BP delegate called when privilege availability changes for a user  */
+	UPROPERTY(BlueprintAssignable, Category = CommonUser)
+	FCommonUserAvailabilityChangedDelegate OnUserPrivilegeChanged;
+
+	/** Send a system message via OnHandleSystemMessage */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual void SendSystemMessage(FGameplayTag MessageType, FText TitleText, FText BodyText);
+
+	/** Sets the maximum number of local players, will not destroy existing ones */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual void SetMaxLocalPlayers(int32 InMaxLocalPLayers);
+
+	/** Gets the maximum number of local players */
+	UFUNCTION(BlueprintPure, Category = CommonUser)
+	COMMONUSER_API int32 GetMaxLocalPlayers() const;
+
+	/** Gets the current number of local players, will always be at least 1 */
+	UFUNCTION(BlueprintPure, Category = CommonUser)
+	COMMONUSER_API int32 GetNumLocalPlayers() const;
+
+	/** Returns the state of initializing the specified local player */
+	UFUNCTION(BlueprintPure, Category = CommonUser)
+	COMMONUSER_API ECommonUserInitializationState GetLocalPlayerInitializationState(int32 LocalPlayerIndex) const;
+
+	/** Returns the user info for a given local player index in game instance, 0 is always valid in a running game */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForLocalPlayerIndex(int32 LocalPlayerIndex) const;
+
+	/** Deprecated, use PlatformUserId when available */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForPlatformUserIndex(int32 PlatformUserIndex) const;
+
+	/** Returns the primary user info for a given platform user index. Can return null */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForPlatformUser(FPlatformUserId PlatformUser) const;
+
+	/** Returns the user info for a unique net id. Can return null */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForUniqueNetId(const FUniqueNetIdRepl& NetId) const;
+
+	/** Deprecated, use InputDeviceId when available */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForControllerId(int32 ControllerId) const;
+
+	/** Returns the user info for a given input device. Can return null */
+	UFUNCTION(BlueprintCallable, BlueprintPure = False, Category = CommonUser)
+	COMMONUSER_API const UCommonUserInfo* GetUserInfoForInputDevice(FInputDeviceId InputDevice) const;
+
+	/**
+	 * Tries to start the process of creating or updating a local player, including logging in and creating a player controller.
+	 * When the process has succeeded or failed, it will broadcast the OnUserInitializeComplete delegate.
+	 *
+	 * @param LocalPlayerIndex	Desired index of LocalPlayer in Game Instance, 0 will be primary player and 1+ for local multiplayer
+	 * @param PrimaryInputDevice The physical controller that should be mapped to this user, will use the default device if invalid
+	 * @param bCanUseGuestLogin	If true, this player can be a guest without a real Unique Net Id
+	 *
+	 * @returns true if the process was started, false if it failed before properly starting
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual bool TryToInitializeForLocalPlay(int32 LocalPlayerIndex, FInputDeviceId PrimaryInputDevice, bool bCanUseGuestLogin);
+
+	/**
+	 * Starts the process of taking a locally logged in user and doing a full online login including account permission checks.
+	 * When the process has succeeded or failed, it will broadcast the OnUserInitializeComplete delegate.
+	 *
+	 * @param LocalPlayerIndex	Index of existing LocalPlayer in Game Instance
+	 *
+	 * @returns true if the process was started, false if it failed before properly starting
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual bool TryToLoginForOnlinePlay(int32 LocalPlayerIndex);
+
+	/**
+	 * Starts a general user login and initialization process, using the params structure to determine what to log in to.
+	 * When the process has succeeded or failed, it will broadcast the OnUserInitializeComplete delegate.
+	 * AsyncAction_CommonUserInitialize provides several wrapper functions for using this in an Event graph.
+	 *
+	 * @returns true if the process was started, false if it failed before properly starting
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual bool TryToInitializeUser(FCommonUserInitializeParams Params);
+
+	/** 
+	 * Starts the process of listening for user input for new and existing controllers and logging them.
+	 * This will insert a key input handler on the active GameViewportClient and is turned off by calling again with empty key arrays.
+	 *
+	 * @param AnyUserKeys		Listen for these keys for any user, even the default user. Set this for an initial press start screen or empty to disable
+	 * @param NewUserKeys		Listen for these keys for a new user without a player controller. Set this for splitscreen/local multiplayer or empty to disable
+	 * @param Params			Params passed to TryToInitializeUser after detecting key input
+	 */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual void ListenForLoginKeyInput(TArray<FKey> AnyUserKeys, TArray<FKey> NewUserKeys, FCommonUserInitializeParams Params);
+
+	/** Attempts to cancel an in-progress initialization attempt, this may not work on all platforms but will disable callbacks */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual bool CancelUserInitialization(int32 LocalPlayerIndex);
+
+	/** Logs a player out of any online systems, and optionally destroys the player entirely if it's not the first one */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual bool TryToLogOutUser(int32 LocalPlayerIndex, bool bDestroyPlayer = false);
+
+	/** Resets the login and initialization state when returning to the main menu after an error */
+	UFUNCTION(BlueprintCallable, Category = CommonUser)
+	COMMONUSER_API virtual void ResetUserState();
+
+	/** Returns true if this this could be a real platform user with a valid identity (even if not currently logged in)  */
+	COMMONUSER_API virtual bool IsRealPlatformUserIndex(int32 PlatformUserIndex) const;
+
+	/** Returns true if this this could be a real platform user with a valid identity (even if not currently logged in) */
+	COMMONUSER_API virtual bool IsRealPlatformUser(FPlatformUserId PlatformUser) const;
+
+	/** Converts index to id */
+	COMMONUSER_API virtual FPlatformUserId GetPlatformUserIdForIndex(int32 PlatformUserIndex) const;
+
+	/** Converts id to index */
+	COMMONUSER_API virtual int32 GetPlatformUserIndexForId(FPlatformUserId PlatformUser) const;
+
+	/** Gets the user for an input device */
+	COMMONUSER_API virtual FPlatformUserId GetPlatformUserIdForInputDevice(FInputDeviceId InputDevice) const;
+
+	/** Gets a user's primary input device id */
+	COMMONUSER_API virtual FInputDeviceId GetPrimaryInputDeviceForPlatformUser(FPlatformUserId PlatformUser) const;
+
+	/** Call from game code to set the cached trait tags when platform state or options changes */
+	COMMONUSER_API virtual void SetTraitTags(const FGameplayTagContainer& InTags);
+
+	/** Gets the current tags that affect feature avialability */
+	const FGameplayTagContainer& GetTraitTags() const { return CachedTraitTags; }
+
+	/** Checks if a specific platform/feature tag is enabled */
+	UFUNCTION(BlueprintPure, Category=CommonUser)
+	bool HasTraitTag(const FGameplayTag TraitTag) const { return CachedTraitTags.HasTag(TraitTag); }
+
+	/** Checks to see if we should display a press start/input confirmation screen at startup. Games can call this or check the trait tags directly */
+	UFUNCTION(BlueprintPure, BlueprintPure, Category=CommonUser)
+	COMMONUSER_API virtual bool ShouldWaitForStartInput() const;
+
+
+	// Functions for accessing low-level online system information
+
+#if COMMONUSER_OSSV1
+	/** Returns OSS interface of specific type, will return null if there is no type */
+	COMMONUSER_API IOnlineSubsystem* GetOnlineSubsystem(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns identity interface of specific type, will return null if there is no type */
+	COMMONUSER_API IOnlineIdentity* GetOnlineIdentity(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns human readable name of OSS system */
+	COMMONUSER_API FName GetOnlineSubsystemName(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the current online connection status */
+	COMMONUSER_API EOnlineServerConnectionStatus::Type GetConnectionStatus(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+#else
+	/** Get the services provider type, or None if there isn't one. */
+	COMMONUSER_API UE::Online::EOnlineServices GetOnlineServicesProvider(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+	
+	/** Returns auth interface of specific type, will return null if there is no type */
+	COMMONUSER_API UE::Online::IAuthPtr GetOnlineAuth(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the current online connection status */
+	COMMONUSER_API UE::Online::EOnlineServicesConnectionStatus GetConnectionStatus(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+#endif
+
+	/** Returns true if we are currently connected to backend servers */
+	COMMONUSER_API bool HasOnlineConnection(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the current login status for a player on the specified online system, only works for real platform users */
+	COMMONUSER_API ELoginStatusType GetLocalUserLoginStatus(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the unique net id for a local platform user */
+	COMMONUSER_API FUniqueNetIdRepl GetLocalUserNetId(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Returns the nickname for a local platform user, this is cached in common user Info */
+	COMMONUSER_API FString GetLocalUserNickname(FPlatformUserId PlatformUser, ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+
+	/** Convert a user id to a debug string */
+	COMMONUSER_API FString PlatformUserIdToString(FPlatformUserId UserId);
+
+	/** Convert a context to a debug string */
+	COMMONUSER_API FString ECommonUserOnlineContextToString(ECommonUserOnlineContext Context);
+
+	/** Returns human readable string for privilege checks */
+	COMMONUSER_API virtual FText GetPrivilegeDescription(ECommonUserPrivilege Privilege) const;
+	COMMONUSER_API virtual FText GetPrivilegeResultDescription(ECommonUserPrivilegeResult Result) const;
+
+	/** 
+	 * Starts the process of login for an existing local user, will return false if callback was not scheduled 
+	 * This activates the low level state machine and does not modify the initialization state on user info
+	 */
+	DECLARE_DELEGATE_FiveParams(FOnLocalUserLoginCompleteDelegate, const UCommonUserInfo* /*UserInfo*/, ELoginStatusType /*NewStatus*/, FUniqueNetIdRepl /*NetId*/, const TOptional<FOnlineErrorType>& /*Error*/, ECommonUserOnlineContext /*Type*/);
+	COMMONUSER_API virtual bool LoginLocalUser(const UCommonUserInfo* UserInfo, ECommonUserPrivilege RequestedPrivilege, ECommonUserOnlineContext Context, FOnLocalUserLoginCompleteDelegate OnComplete);
+
+	/** Assign a local player to a specific local user and call callbacks as needed */
+	COMMONUSER_API virtual void SetLocalPlayerUserInfo(ULocalPlayer* LocalPlayer, const UCommonUserInfo* UserInfo);
+
+	/** Resolves a context that has default behavior into a specific context */
+	COMMONUSER_API ECommonUserOnlineContext ResolveOnlineContext(ECommonUserOnlineContext Context) const;
+
+	/** True if there is a separate platform and service interface */
+	COMMONUSER_API bool HasSeparatePlatformContext() const;
+
+protected:
+	/** Internal structure that caches status and pointers for each online context */
+	struct FOnlineContextCache
+	{
+#if COMMONUSER_OSSV1
+		/** Pointer to base subsystem, will stay valid as long as game instance does */
+		IOnlineSubsystem* OnlineSubsystem = nullptr;
+
+		/** Cached identity system, this will always be valid */
+		IOnlineIdentityPtr IdentityInterface;
+
+		/** Last connection status that was passed into the HandleNetworkConnectionStatusChanged hander */
+		EOnlineServerConnectionStatus::Type	CurrentConnectionStatus = EOnlineServerConnectionStatus::Normal;
+#else
+		/** Online services, accessor to specific services */
+		UE::Online::IOnlineServicesPtr OnlineServices;
+		/** Cached auth service */
+		UE::Online::IAuthPtr AuthService;
+		/** Login status changed event handle */
+		UE::Online::FOnlineEventDelegateHandle LoginStatusChangedHandle;
+		/** Connection status changed event handle */
+		UE::Online::FOnlineEventDelegateHandle ConnectionStatusChangedHandle;
+		/** Last connection status that was passed into the HandleNetworkConnectionStatusChanged hander */
+		UE::Online::EOnlineServicesConnectionStatus CurrentConnectionStatus = UE::Online::EOnlineServicesConnectionStatus::NotConnected;
+#endif
+
+		/** Resets state, important to clear all shared ptrs */
+		void Reset()
+		{
+#if COMMONUSER_OSSV1
+			OnlineSubsystem = nullptr;
+			IdentityInterface.Reset();
+			CurrentConnectionStatus = EOnlineServerConnectionStatus::Normal;
+#else
+			OnlineServices.Reset();
+			AuthService.Reset();
+			CurrentConnectionStatus = UE::Online::EOnlineServicesConnectionStatus::NotConnected;
+#endif
+		}
+	};
+
+	/** Internal structure to represent an in-progress login request */
+	struct FUserLoginRequest : public TSharedFromThis<FUserLoginRequest>
+	{
+		FUserLoginRequest(UCommonUserInfo* InUserInfo, ECommonUserPrivilege InPrivilege, ECommonUserOnlineContext InContext, FOnLocalUserLoginCompleteDelegate&& InDelegate)
+			: UserInfo(TWeakObjectPtr<UCommonUserInfo>(InUserInfo))
+			, DesiredPrivilege(InPrivilege)
+			, DesiredContext(InContext)
+			, Delegate(MoveTemp(InDelegate))
+			{}
+
+		/** Which local user is trying to log on */
+		TWeakObjectPtr<UCommonUserInfo> UserInfo;
+
+		/** Overall state of login request, could come from many sources */
+		ECommonUserAsyncTaskState OverallLoginState = ECommonUserAsyncTaskState::NotStarted;
+
+		/** State of attempt to use platform auth. When started, this immediately transitions to Failed for OSSv1, as we do not support platform auth there. */
+		ECommonUserAsyncTaskState TransferPlatformAuthState = ECommonUserAsyncTaskState::NotStarted;
+
+		/** State of attempt to use AutoLogin */
+		ECommonUserAsyncTaskState AutoLoginState = ECommonUserAsyncTaskState::NotStarted;
+
+		/** State of attempt to use external login UI */
+		ECommonUserAsyncTaskState LoginUIState = ECommonUserAsyncTaskState::NotStarted;
+
+		/** Final privilege to that is requested */
+		ECommonUserPrivilege DesiredPrivilege = ECommonUserPrivilege::Invalid_Count;
+
+		/** State of attempt to request the relevant privilege */
+		ECommonUserAsyncTaskState PrivilegeCheckState = ECommonUserAsyncTaskState::NotStarted;
+
+		/** The final context to log into */
+		ECommonUserOnlineContext DesiredContext = ECommonUserOnlineContext::Invalid;
+
+		/** What online system we are currently logging into */
+		ECommonUserOnlineContext CurrentContext = ECommonUserOnlineContext::Invalid;
+
+		/** User callback for completion */
+		FOnLocalUserLoginCompleteDelegate Delegate;
+
+		/** Most recent/relevant error to display to user */
+		TOptional<FOnlineErrorType> Error;
+	};
+
+
+	/** Create a new user info object */
+	COMMONUSER_API virtual UCommonUserInfo* CreateLocalUserInfo(int32 LocalPlayerIndex);
+
+	/** Deconst wrapper for const getters */
+	FORCEINLINE UCommonUserInfo* ModifyInfo(const UCommonUserInfo* Info) { return const_cast<UCommonUserInfo*>(Info); }
+
+	/** Refresh user info from OSS */
+	COMMONUSER_API virtual void RefreshLocalUserInfo(UCommonUserInfo* UserInfo);
+
+	/** Possibly send privilege availability notification, compares current value to cached old value */
+	COMMONUSER_API virtual void HandleChangedAvailability(UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserAvailability OldAvailability);
+
+	/** Updates the cached privilege on a user and notifies delegate */
+	COMMONUSER_API virtual void UpdateUserPrivilegeResult(UCommonUserInfo* UserInfo, ECommonUserPrivilege Privilege, ECommonUserPrivilegeResult Result, ECommonUserOnlineContext Context);
+
+	/** Gets internal data for a type of online system, can return null for service */
+	COMMONUSER_API const FOnlineContextCache* GetContextCache(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game) const;
+	COMMONUSER_API FOnlineContextCache* GetContextCache(ECommonUserOnlineContext Context = ECommonUserOnlineContext::Game);
+
+	/** Create and set up system objects before delegates are bound */
+	COMMONUSER_API virtual void CreateOnlineContexts();
+	COMMONUSER_API virtual void DestroyOnlineContexts();
+
+	/** Bind online delegates */
+	COMMONUSER_API virtual void BindOnlineDelegates();
+
+	/** Forcibly logs out and deinitializes a single user */
+	COMMONUSER_API virtual void LogOutLocalUser(FPlatformUserId PlatformUser);
+
+	/** Performs the next step of a login request, which could include completing it. Returns true if it's done */
+	COMMONUSER_API virtual void ProcessLoginRequest(TSharedRef<FUserLoginRequest> Request);
+
+	/** Call login on OSS, with platform auth from the platform OSS. Return true if AutoLogin started */
+	COMMONUSER_API virtual bool TransferPlatformAuth(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+
+	/** Call AutoLogin on OSS. Return true if AutoLogin started. */
+	COMMONUSER_API virtual bool AutoLogin(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+
+	/** Call ShowLoginUI on OSS. Return true if ShowLoginUI started. */
+	COMMONUSER_API virtual bool ShowLoginUI(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+
+	/** Call QueryUserPrivilege on OSS. Return true if QueryUserPrivilege started. */
+	COMMONUSER_API virtual bool QueryUserPrivilege(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+
+	/** OSS-specific functions */
+#if COMMONUSER_OSSV1
+	COMMONUSER_API virtual ECommonUserPrivilege ConvertOSSPrivilege(EUserPrivileges::Type Privilege) const;
+	COMMONUSER_API virtual EUserPrivileges::Type ConvertOSSPrivilege(ECommonUserPrivilege Privilege) const;
+	COMMONUSER_API virtual ECommonUserPrivilegeResult ConvertOSSPrivilegeResult(EUserPrivileges::Type Privilege, uint32 Results) const;
+
+	COMMONUSER_API void BindOnlineDelegatesOSSv1();
+	COMMONUSER_API bool AutoLoginOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API bool ShowLoginUIOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API bool QueryUserPrivilegeOSSv1(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+#else
+	COMMONUSER_API virtual ECommonUserPrivilege ConvertOnlineServicesPrivilege(UE::Online::EUserPrivileges Privilege) const;
+	COMMONUSER_API virtual UE::Online::EUserPrivileges ConvertOnlineServicesPrivilege(ECommonUserPrivilege Privilege) const;
+	COMMONUSER_API virtual ECommonUserPrivilegeResult ConvertOnlineServicesPrivilegeResult(UE::Online::EUserPrivileges Privilege, UE::Online::EPrivilegeResults Results) const;
+
+	COMMONUSER_API void BindOnlineDelegatesOSSv2();
+	COMMONUSER_API void CacheConnectionStatus(ECommonUserOnlineContext Context);
+	COMMONUSER_API bool TransferPlatformAuthOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API bool AutoLoginOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API bool ShowLoginUIOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API bool QueryUserPrivilegeOSSv2(FOnlineContextCache* System, TSharedRef<FUserLoginRequest> Request, FPlatformUserId PlatformUser);
+	COMMONUSER_API TSharedPtr<UE::Online::FAccountInfo> GetOnlineServiceAccountInfo(UE::Online::IAuthPtr AuthService, FPlatformUserId InUserId) const;
+#endif
+
+	/** Callbacks for OSS functions */
+#if COMMONUSER_OSSV1
+	COMMONUSER_API virtual void HandleIdentityLoginStatusChanged(int32 PlatformUserIndex, ELoginStatus::Type OldStatus, ELoginStatus::Type NewStatus, const FUniqueNetId& NewId, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleUserLoginCompleted(int32 PlatformUserIndex, bool bWasSuccessful, const FUniqueNetId& NetId, const FString& Error, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleControllerPairingChanged(int32 PlatformUserIndex, FControllerPairingChangedUserInfo PreviousUser, FControllerPairingChangedUserInfo NewUser);
+	COMMONUSER_API virtual void HandleNetworkConnectionStatusChanged(const FString& ServiceName, EOnlineServerConnectionStatus::Type LastConnectionStatus, EOnlineServerConnectionStatus::Type ConnectionStatus, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleOnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInNetId, const int PlatformUserIndex, const FOnlineError& Error, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleCheckPrivilegesComplete(const FUniqueNetId& UserId, EUserPrivileges::Type Privilege, uint32 PrivilegeResults, ECommonUserPrivilege RequestedPrivilege, TWeakObjectPtr<UCommonUserInfo> CommonUserInfo, ECommonUserOnlineContext Context);
+#else
+	COMMONUSER_API virtual void HandleAuthLoginStatusChanged(const UE::Online::FAuthLoginStatusChanged& EventParameters, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleUserLoginCompletedV2(const UE::Online::TOnlineResult<UE::Online::FAuthLogin>& Result, FPlatformUserId PlatformUser, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleOnLoginUIClosedV2(const UE::Online::TOnlineResult<UE::Online::FExternalUIShowLoginUI>& Result, FPlatformUserId PlatformUser, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleNetworkConnectionStatusChanged(const UE::Online::FConnectionStatusChanged& EventParameters, ECommonUserOnlineContext Context);
+	COMMONUSER_API virtual void HandleCheckPrivilegesComplete(const UE::Online::TOnlineResult<UE::Online::FQueryUserPrivilege>& Result, TWeakObjectPtr<UCommonUserInfo> CommonUserInfo, UE::Online::EUserPrivileges DesiredPrivilege, ECommonUserOnlineContext Context);
+#endif
+
+	/**
+	 * Callback for when an input device (i.e. a gamepad) has been connected or disconnected. 
+	 */
+	COMMONUSER_API virtual void HandleInputDeviceConnectionChanged(EInputDeviceConnectionState NewConnectionState, FPlatformUserId PlatformUserId, FInputDeviceId InputDeviceId);
+
+	COMMONUSER_API virtual void HandleLoginForUserInitialize(const UCommonUserInfo* UserInfo, ELoginStatusType NewStatus, FUniqueNetIdRepl NetId, const TOptional<FOnlineErrorType>& Error, ECommonUserOnlineContext Context, FCommonUserInitializeParams Params);
+	COMMONUSER_API virtual void HandleUserInitializeFailed(FCommonUserInitializeParams Params, FText Error);
+	COMMONUSER_API virtual void HandleUserInitializeSucceeded(FCommonUserInitializeParams Params);
+
+	/** Callback for handling press start/login logic */
+	COMMONUSER_API virtual bool OverrideInputKeyForLogin(FInputKeyEventArgs& EventArgs);
+
+
+	/** Previous override handler, will restore on cancel */
+	FOverrideInputKeyHandler WrappedInputKeyHandler;
+
+	/** List of keys to listen for from any user */
+	TArray<FKey> LoginKeysForAnyUser;
+
+	/** List of keys to listen for a new unmapped user */
+	TArray<FKey> LoginKeysForNewUser;
+
+	/** Params to use for a key-triggered login */
+	FCommonUserInitializeParams ParamsForLoginKey;
+
+	/** Maximum number of local players */
+	int32 MaxNumberOfLocalPlayers = 0;
+	
+	/** True if this is a dedicated server, which doesn't require a LocalPlayer */
+	bool bIsDedicatedServer = false;
+
+	/** List of current in progress login requests */
+	TArray<TSharedRef<FUserLoginRequest>> ActiveLoginRequests;
+
+	/** Information about each local user, from local player index to user */
+	UPROPERTY()
+	TMap<int32, TObjectPtr<UCommonUserInfo>> LocalUserInfos;
+	
+	/** Cached platform/mode trait tags */
+	FGameplayTagContainer CachedTraitTags;
+
+	/** Do not access this outside of initialization */
+	FOnlineContextCache* DefaultContextInternal = nullptr;
+	FOnlineContextCache* ServiceContextInternal = nullptr;
+	FOnlineContextCache* PlatformContextInternal = nullptr;
+
+	friend UCommonUserInfo;
+};
diff --git a/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserTypes.h b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserTypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..88d4a976fead2fcd3cbad711188394ed330e24f8
--- /dev/null
+++ b/LyraStarterGame/Plugins/CommonUser/Source/CommonUser/Public/CommonUserTypes.h
@@ -0,0 +1,218 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+
+#if COMMONUSER_OSSV1
+
+// Online Subsystem (OSS v1) includes and forward declares
+#include "OnlineSubsystemTypes.h"
+class IOnlineSubsystem;
+struct FOnlineError;
+using FOnlineErrorType = FOnlineError;
+using ELoginStatusType = ELoginStatus::Type;
+
+#else
+
+// Online Services (OSS v2) includes and forward declares
+#include "Online/Connectivity.h"
+#include "Online/OnlineError.h"
+namespace UE::Online
+{
+	enum class ELoginStatus : uint8;
+	enum class EPrivilegeResults : uint32;
+	enum class EUserPrivileges : uint8;
+	using IAuthPtr = TSharedPtr<class IAuth>;
+	using IOnlineServicesPtr = TSharedPtr<class IOnlineServices>;
+	template <typename OpType>
+	class TOnlineResult;
+	struct FAuthLogin;
+	struct FConnectionStatusChanged;
+	struct FExternalUIShowLoginUI;
+	struct FAuthLoginStatusChanged;
+	struct FQueryUserPrivilege;
+	struct FAccountInfo;
+}
+using FOnlineErrorType = UE::Online::FOnlineError;
+using ELoginStatusType = UE::Online::ELoginStatus;
+
+#endif
+
+#include "CommonUserTypes.generated.h"
+
+
+/** Enum specifying where and how to run online queries */
+UENUM(BlueprintType)
+enum class ECommonUserOnlineContext : uint8
+{
+	/** Called from game code, this uses the default system but with special handling that could merge results from multiple contexts */
+	Game,
+
+	/** The default engine online system, this will always exist and will be the same as either Service or Platform */
+	Default,
+	
+	/** Explicitly ask for the external service, which may not exist */
+	Service,
+
+	/** Looks for external service first, then falls back to default */
+	ServiceOrDefault,
+	
+	/** Explicitly ask for the platform system, which may not exist */
+	Platform,
+
+	/** Looks for platform system first, then falls back to default */
+	PlatformOrDefault,
+
+	/** Invalid system */
+	Invalid
+};
+
+/** Enum describing the state of initialization for a specific user */
+UENUM(BlueprintType)
+enum class ECommonUserInitializationState : uint8
+{
+	/** User has not started login process */
+	Unknown,
+
+	/** Player is in the process of acquiring a user id with local login */
+	DoingInitialLogin,
+
+	/** Player is performing the network login, they have already logged in locally */
+	DoingNetworkLogin,
+
+	/** Player failed to log in at all */
+	FailedtoLogin,
+
+	
+	/** Player is logged in and has access to online functionality */
+	LoggedInOnline,
+
+	/** Player is logged in locally (either guest or real user), but cannot perform online actions */
+	LoggedInLocalOnly,
+
+
+	/** Invalid state or user */
+	Invalid,
+};
+
+/** Enum specifying different privileges and capabilities available to a user */
+UENUM(BlueprintType)
+enum class ECommonUserPrivilege : uint8
+{
+	/** Whether the user can play at all, online or offline */
+	CanPlay,
+
+	/** Whether the user can play in online modes */
+	CanPlayOnline,
+
+	/** Whether the user can use text chat */
+	CanCommunicateViaTextOnline,
+
+	/** Whether the user can use voice chat */
+	CanCommunicateViaVoiceOnline,
+
+	/** Whether the user can access content generated by other users */
+	CanUseUserGeneratedContent,
+
+	/** Whether the user can ever participate in cross-play */
+	CanUseCrossPlay,
+
+	/** Invalid privilege (also the count of valid ones) */
+	Invalid_Count					UMETA(Hidden)
+};
+
+/** Enum specifying the general availability of a feature or privilege, this combines information from multiple sources */
+UENUM(BlueprintType)
+enum class ECommonUserAvailability : uint8
+{
+	/** State is completely unknown and needs to be queried */
+	Unknown,
+
+	/** This feature is fully available for use right now */
+	NowAvailable,
+
+	/** This might be available after the completion of normal login procedures */
+	PossiblyAvailable,
+
+	/** This feature is not available now because of something like network connectivity but may be available in the future */
+	CurrentlyUnavailable,
+
+	/** This feature will never be available for the rest of this session due to hard account or platform restrictions */
+	AlwaysUnavailable,
+
+	/** Invalid feature */
+	Invalid,
+};
+
+/** Enum giving specific reasons why a user may or may not use a certain privilege */
+UENUM(BlueprintType)
+enum class ECommonUserPrivilegeResult : uint8
+{
+	/** State is unknown and needs to be queried */
+	Unknown,
+
+	/** This privilege is fully available for use */
+	Available,
+
+	/** User has not fully logged in */
+	UserNotLoggedIn,
+
+	/** User does not own the game or content */
+	LicenseInvalid,
+
+	/** The game needs to be updated or patched before this will be available */
+	VersionOutdated,
+
+	/** No network connection, this may be resolved by reconnecting */
+	NetworkConnectionUnavailable,
+
+	/** Parental control failure */
+	AgeRestricted,
+
+	/** Account does not have a required subscription or account type */
+	AccountTypeRestricted,
+
+	/** Another account/user restriction such as being banned by the service */
+	AccountUseRestricted,
+
+	/** Other platform-specific failure */
+	PlatformFailure,
+};
+
+/** Used to track the progress of different asynchronous operations */
+enum class ECommonUserAsyncTaskState : uint8
+{
+	/** The task has not been started */
+	NotStarted,
+	/** The task is currently being processed */
+	InProgress,
+	/** The task has completed successfully */
+	Done,
+	/** The task failed to complete */
+	Failed
+};
+
+/** Detailed information about the online error. Effectively a wrapper for FOnlineError. */
+USTRUCT(BlueprintType)
+struct FOnlineResultInformation
+{
+	GENERATED_BODY()
+
+	/** Whether the operation was successful or not. If it was successful, the error fields of this struct will not contain extra information. */
+	UPROPERTY(BlueprintReadOnly)
+	bool bWasSuccessful = true;
+
+	/** The unique error id. Can be used to compare against specific handled errors. */
+	UPROPERTY(BlueprintReadOnly)
+	FString ErrorId;
+
+	/** Error text to display to the user. */
+	UPROPERTY(BlueprintReadOnly)
+	FText ErrorText;
+
+	/**
+	 * Initialize this from an FOnlineErrorType
+	 * @param InOnlineError the online error to initialize from
+	 */
+	void COMMONUSER_API FromOnlineError(const FOnlineErrorType& InOnlineError);
+};
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Binaries/Win64/UnrealEditor.modules b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Binaries/Win64/UnrealEditor.modules
new file mode 100644
index 0000000000000000000000000000000000000000..1af34b11e782d6d2eeb43b1dc19023a0e424c8c3
--- /dev/null
+++ b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Binaries/Win64/UnrealEditor.modules
@@ -0,0 +1,7 @@
+{
+	"BuildId": "43139311",
+	"Modules": 
+	{
+		"ShooterCoreRuntime": "UnrealEditor-ShooterCoreRuntime.dll"
+	}
+}
\ No newline at end of file
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Config/Tags/ShooterCoreTags.ini b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Config/Tags/ShooterCoreTags.ini
new file mode 100644
index 0000000000000000000000000000000000000000..04d4430e74f47bbfebdd9dd2a803a3e4e32e92b9
--- /dev/null
+++ b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Config/Tags/ShooterCoreTags.ini
@@ -0,0 +1,62 @@
+[/Script/GameplayTags.GameplayTagsList]
+GameplayTagList=(Tag="Ability.ActivateFail.MagazineFull",DevComment="")
+GameplayTagList=(Tag="Ability.ActivateFail.NoSpareAmmo",DevComment="")
+GameplayTagList=(Tag="Event.Movement.ADS",DevComment="")
+GameplayTagList=(Tag="Event.Movement.Dash",DevComment="")
+GameplayTagList=(Tag="Event.Movement.Melee",DevComment="")
+GameplayTagList=(Tag="Event.Movement.Reload",DevComment="")
+GameplayTagList=(Tag="Event.Movement.WeaponFire",DevComment="")
+GameplayTagList=(Tag="Gameplay.Message.ADS",DevComment="Message to UI, Reticle")
+GameplayTagList=(Tag="Gameplay.Message.Nameplate.Add",DevComment="Register Nameplate Source")
+GameplayTagList=(Tag="Gameplay.Message.Nameplate.Discover",DevComment="Looking for nameplates")
+GameplayTagList=(Tag="Gameplay.Message.Nameplate.Remove",DevComment="Unregister Nameplate Source")
+GameplayTagList=(Tag="GameplayCue.Character.Spawn",DevComment="At spawning of the player in shooter game")
+GameplayTagList=(Tag="GameplayCue.ShooterGame.Interact.Collect",DevComment="")
+GameplayTagList=(Tag="GameplayCue.ShooterGame.Interact.WeaponPickup",DevComment="GCN for weapon pick FX attached to pawn")
+GameplayTagList=(Tag="GameplayCue.ShooterGame.UserMessage.MatchDecided",DevComment="")
+GameplayTagList=(Tag="GameplayCue.ShooterGame.UserMessage.WaitingForPlayers",DevComment="")
+GameplayTagList=(Tag="GameplayEvent.ReloadDone",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.EliminationFeed",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.Equipment",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.ModeStatus",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.PerfStats.Graph",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.PerfStats.Text",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.Reticle",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.TeamScore",DevComment="")
+GameplayTagList=(Tag="HUD.Slot.TopAccolades",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.Emote",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.Interact",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.Quickslot.CycleBackward",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.Quickslot.CycleForward",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.Quickslot.SelectSlot",DevComment="Used to directly select one of the quickbar slots. Intended to be accompanied with a 0-based slot index.")
+GameplayTagList=(Tag="InputTag.Ability.ShowLeaderboard",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.ToggleInventory",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.ToggleMap",DevComment="")
+GameplayTagList=(Tag="InputTag.Ability.ToggleMarkerInWorld",DevComment="")
+GameplayTagList=(Tag="Lyra.AddNotification.KillFeed",DevComment="SendKillFeedInfo to UI")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationChain",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationChain.2x",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationChain.3x",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationChain.4x",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationChain.5x",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationStreak",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationStreak.5",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationStreak.10",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationStreak.15",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Accolade.EliminationStreak.20",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.TDM.TeamScore",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Weapon.MagazineAmmo",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Weapon.MagazineSize",DevComment="")
+GameplayTagList=(Tag="Lyra.ShooterGame.Weapon.SpareAmmo",DevComment="")
+GameplayTagList=(Tag="ShooterGame.ControlPoint.Captured.Message",DevComment="Fired when a control point has been captured by a team")
+GameplayTagList=(Tag="ShooterGame.ControlPoint.TeamScore",DevComment="")
+GameplayTagList=(Tag="ShooterGame.ExtensionPoint.AbilityBar",DevComment="")
+GameplayTagList=(Tag="ShooterGame.GamePhase.Playing",DevComment="")
+GameplayTagList=(Tag="ShooterGame.GamePhase.PostGame",DevComment="")
+GameplayTagList=(Tag="ShooterGame.GamePhase.Warmup",DevComment="")
+GameplayTagList=(Tag="ShooterGame.Score.Assists",DevComment="")
+GameplayTagList=(Tag="ShooterGame.Score.ControlPointCapture",DevComment="")
+GameplayTagList=(Tag="ShooterGame.Score.Deaths",DevComment="")
+GameplayTagList=(Tag="ShooterGame.Score.Eliminations",DevComment="")
+GameplayTagList=(Tag="TODO.GameModeDamageImmunity",DevComment="")
+
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_GrantInventoryPad_WithMesh.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_GrantInventoryPad_WithMesh.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8dd2d052b008058e52b577b3146d57e1d0dce85a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_GrantInventoryPad_WithMesh.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_Launcher_Up.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_Launcher_Up.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..17f355889417a019252cfd2a01f8f9fa45577663
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_Launcher_Up.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_PerfTestActor.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_PerfTestActor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..401bd24d018fe616f9a8a5a20d1b8e2408910562
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/B_PerfTestActor.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/Macros/BPML_VFXMacros.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/Macros/BPML_VFXMacros.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4bdfe9b70308294a114bc9bc06afa5ee45194229
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/Macros/BPML_VFXMacros.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/SM_XFacingCylinderUnit1.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/SM_XFacingCylinderUnit1.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..84718934862f9ea21e469f3449b7dbca8d6ae775
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Blueprint/SM_XFacingCylinderUnit1.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BB_Lyra_Shooter_Bot.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BB_Lyra_Shooter_Bot.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7796c7e2d0d0e75d4cb3db5564437c3ae5289648
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BB_Lyra_Shooter_Bot.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BTDecorator_AllowedToFire.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BTDecorator_AllowedToFire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b0ff0d99591a049694ea19b9e141b26ad6b8adca
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BTDecorator_AllowedToFire.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BT_Lyra_Shooter_Bot.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BT_Lyra_Shooter_Bot.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..dafb591299ca76283a0ca34f6d7132f5bfb837df
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/BT/BT_Lyra_Shooter_Bot.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6b6d10bbaf5b5c655f9f9c8a68853a7a2d63cd14
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter_Passive.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter_Passive.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..33f8100afced65574712dc636337eb56be31c2a6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_AI_Controller_LyraShooter_Passive.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6bf11544665cf80ea89a3cd03aa7eeb20deae1cf
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner_Perf.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner_Perf.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4e97949ea95855ce7b07fd665ba8385bc805dc40
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/B_ShooterBotSpawner_Perf.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_ControlPoints.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_ControlPoints.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f46acffb779839fdc165eee97bb448788da5b031
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_ControlPoints.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_TargetEnemy.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_TargetEnemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..36fa0502209194af39f7f845afe0b2fa97384629
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_TargetEnemy.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_WeaponCheck.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_WeaponCheck.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..539df4e95b7a0d8d57d04073a231557c1cb6ecf4
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Context/EQS_Context_WeaponCheck.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_AIPerceptionEnemy.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_AIPerceptionEnemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..25e7ec97f58ec53c7384ef8e4f34c463346021ac
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_AIPerceptionEnemy.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d4c00152c7a70af24c6fb93c30a8237ad4a6136a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindTarget.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindTarget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6d5a05097268ce9d0a513cc0b39308708cd18522
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindTarget.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindWeapon.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindWeapon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8babb5f6777015db02935ba30b94a64d6e3506ec
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_FindWeapon.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_MoveAgainstEnnemy.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_MoveAgainstEnnemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8eb6e9aaaa7966dd9c9372ea8d17060bce7b6581
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/EQS_MoveAgainstEnnemy.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Generator/EQS_GetAllEnemy.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Generator/EQS_GetAllEnemy.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..67db04b0afd37457c97dcccdc4ca33090ee951bd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS/Generator/EQS_GetAllEnemy.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS_Tester.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS_Tester.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a11ee264b179cb70821800ce2b9cdfc6f13a9534
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/EQS_Tester.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_CheckAmmo.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_CheckAmmo.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..914e5a63a11ea626a0a7cae0f41c841ee0d3a215
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_CheckAmmo.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_ReloadWeapon.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_ReloadWeapon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e802b0fef781eaedb9faacb36db5fc4baedb2b6f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_ReloadWeapon.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_SetFocus.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_SetFocus.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3eb5d2b603e9a33f103ea5563e57679f2075ed47
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Bot/Services/BTS_SetFocus.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/CM_ThirdPersonADS.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/CM_ThirdPersonADS.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c0aeacee87d4e70a11d7de6be4a5e7a43d318c43
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/CM_ThirdPersonADS.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/ThirdPersonADSOffsetCurve.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/ThirdPersonADSOffsetCurve.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..49cd7afa4895c017b028001041629eec58b5c14c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Camera/ThirdPersonADSOffsetCurve.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/BT_Lyra_Shooter_ControlPoint_Bot.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/BT_Lyra_Shooter_ControlPoint_Bot.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4795812ee7aa0c6f60e70dd590da409928f71806
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/BT_Lyra_Shooter_ControlPoint_Bot.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_AI_Controller_LyraShooter_ControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_AI_Controller_LyraShooter_ControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..38a4ed849d341c5d209d8096a3ea2e48c7acace0
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_AI_Controller_LyraShooter_ControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_ShooterBotSpawner_ControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_ShooterBotSpawner_ControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2b65b491d6e70c40cd44f766a90b536b08e2c05c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AI/B_ShooterBotSpawner_ControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AbilitySet_ControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AbilitySet_ControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..04d10c928e061ea87c9a119e8c6dc43623afb2d5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/AbilitySet_ControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/B_MusicManagerComponent_ControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/B_MusicManagerComponent_ControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..efd08ea89ade42db0270c836f95aef5e6aa67021
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/B_MusicManagerComponent_ControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/GA_ShowLeaderboard_CP.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/GA_ShowLeaderboard_CP.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e56e3482efa78de99cfe680541150af7d8c987c1
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/ControlPoint/GA_ShowLeaderboard_CP.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MI_WeaponSpawnerTimerIndicator.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MI_WeaponSpawnerTimerIndicator.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..de09f7c6cc24c27cc5fc2f8629b7da80170d7ca6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MI_WeaponSpawnerTimerIndicator.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_BlackBorder.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_BlackBorder.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6e993b237d42c5c1024e062287c1dcd9b87a7c7c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_BlackBorder.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_CP_Bar.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_CP_Bar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..95eaecf7743e615110fb34cc9b52e067d7919d0d
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_CP_Bar.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_ControlPoint.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_ControlPoint.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5c29659af7eaf9885383926092e7bc975d1ec51c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/MT_ControlPoint.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_CP.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_CP.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0d8784a8bfc590101bcc79ef16b46c17b0abf093
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_CP.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_GrenadeRadius.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_GrenadeRadius.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c3469a9a4672be66358e661b0ec887c4b09b8a81
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_GrenadeRadius.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e7394d6db93e8eb617d050657572c448051cf487
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..820c9d627ef10e77b31f5a4a1ecce9364e421bbc
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6a5dcf3434e564acfe5e3ce42213fc335442cdd0
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_2.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_2.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8c6a3f0e4461918df7d3b70bca7af9f1643e478f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_2.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_3.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_3.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b68e4f84f113edaabb495ca362e6c8ce027d9892
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_3.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_4.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_4.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8096ec7d1cdb2df67b5966b6f902f9da3af4c465
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst1_4.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst2.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst2.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..512dee0011cfe7d3bee81601ecc9c4d554575218
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst2.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst3.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst3.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ed1e0cd0c2e305e50a21fa17cf5fc6e1fb1bda65
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst3.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst4.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst4.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..563d1a90fc9401f0b6ad8db03bcbb95bc360e311
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst4.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst5.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst5.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a6b94a532189a0a2e1e5e6c880b4c5c01c00a1cd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst5.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst6.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst6.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b997e23d0c40bcea079070de624182663a13d222
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_Launcher_Inst6.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_PadColor.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_PadColor.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..58e7c97071906fad60e82c7449158e6aa1f84bec
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_PadColor.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_WeaponSpawnTimerIndicator.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_WeaponSpawnTimerIndicator.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cbdf0732ee2a00a28178fdd5ee093719f664778b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Material/M_WeaponSpawnTimerIndicator.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Mesh/capturepoint_ring_corner.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Mesh/capturepoint_ring_corner.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c909de819a1349789bc8e696f57626eddc466185
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Effects/Mesh/capturepoint_ring_corner.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/AbilitySet_Elimination.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/AbilitySet_Elimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f07bff15260ac955e096ae43411cca8db3c03600
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/AbilitySet_Elimination.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/B_MusicManagerComponent_Elimination.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/B_MusicManagerComponent_Elimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..72cc3e923aa74c81814c30b0b82555e12e563a89
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/B_MusicManagerComponent_Elimination.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/GA_ShowLeaderboard_TDM.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/GA_ShowLeaderboard_TDM.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..77b9f467f7b3f0bd9d38936732b939d725d0fcd1
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Elimination/GA_ShowLeaderboard_TDM.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_LyraShooterGame_ControlPoints.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_LyraShooterGame_ControlPoints.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c609ca6a669c3a88a7cf6a343a089a8051eb7234
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_LyraShooterGame_ControlPoints.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Elimination.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Elimination.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..005b0bce5f7b363dd6f997076574363018fce45a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Elimination.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Perf.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Perf.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9b4087ba21510b092e6358be8161388340879ba6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/B_ShooterGame_Perf.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_SharedInput.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_SharedInput.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bf30e07b09189b515f037e62bd975fb21cf87bbd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_SharedInput.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardComponents.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardComponents.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..24982893d4393af64fab7349f0b95478f2effba8
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardComponents.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardHUD.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardHUD.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..dd9d00a68ec244d8342ddf0fa6feea55875af071
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/LAS_ShooterGame_StandardHUD.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_DamageImmunity_FromGameMode.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_DamageImmunity_FromGameMode.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bd93bbd0404ce9d94126fdbfd281dcd1e80b5bae
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_DamageImmunity_FromGameMode.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_PregameLobby.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_PregameLobby.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b708fa7fa89cb94db0bb792e6231389c19364e94
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/GE_PregameLobby.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_Playing.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_Playing.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3097a5f0eee978eb2e08c8427dba6d86d79e568e
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_Playing.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_PostGame.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_PostGame.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ecb31fa5b67d0e7776d15285e0d623370c815ce9
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Experiences/Phases/Phase_PostGame.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/AbilitySet_ShooterHero.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/AbilitySet_ShooterHero.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1d85c6de98b5512b169abfc3b20fb3da5331e97f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/AbilitySet_ShooterHero.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_HandleShooterReplays.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_HandleShooterReplays.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..afdd73b3a80e8b92e1f460f66489fac6cd50b3cd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_HandleShooterReplays.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_QuickBarComponent.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_QuickBarComponent.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..66682de8b71d8880143eff078d807961bb797afe
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_QuickBarComponent.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamColor_DeviceProperty.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamColor_DeviceProperty.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1fb43043feeaca8f280b17522f008f4b3364377c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamColor_DeviceProperty.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSetup_TwoTeams.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSetup_TwoTeams.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d59b5b86e4182a103ffc3db4a6777a63a5bb3edb
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSetup_TwoTeams.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSpawningRules.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSpawningRules.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e7a2c0fca67a46e45084ae4dcadd14023593c0f2
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/B_TeamSpawningRules.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Dash/W_DashTouchButton.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Dash/W_DashTouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..58447fb8848f065ea4f2f908bbffd7bee718a2d5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Dash/W_DashTouchButton.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/GA_Emote.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/GA_Emote.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5cd72e33cbace415eb8012b7cee0c78e482004e9
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/GA_Emote.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/W_EmoteTouchButton.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/W_EmoteTouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..557cb79df58a46c7bdf3e7e35f803e0cbc4c8c76
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Emote/W_EmoteTouchButton.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/GA_QuickbarSlots.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/GA_QuickbarSlots.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..55ec41c060afa9593d21306210701839ecafaa76
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/GA_QuickbarSlots.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/HeroData_ShooterGame.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/HeroData_ShooterGame.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a96972f0aaf0380eba0580b8f19946c9d918449b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/HeroData_ShooterGame.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Melee/W_MeleeTouchButton.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Melee/W_MeleeTouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b4082bcd9f4b39ec9e6719b83983d612b86b9619
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Melee/W_MeleeTouchButton.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Respawn/GE_SpawnIn.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Respawn/GE_SpawnIn.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a9ef7b770bf5c641fb9267f37452cfdc4d1681cd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/Respawn/GE_SpawnIn.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/TagRelationships_ShooterHero.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/TagRelationships_ShooterHero.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..01028527442ee3a9e1c8032d73972f7d01c07e48
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Game/TagRelationships_ShooterHero.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_MatchDecided.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_MatchDecided.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..780c55bcc878df1f3087b2751f7c437dabdc86ec
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_MatchDecided.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_WaitingForPlayers.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_WaitingForPlayers.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c0ab6e8f6c3175ec6267c23cf613134e90810c40
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCNL_WaitingForPlayers.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_InteractPickUp.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_InteractPickUp.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a70dc1b821124e9ad7e774fbb01f7fc2e157a7b3
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_InteractPickUp.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_Melee.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fcde3bb002360199cb9489929a30ef5d76475de4
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_Melee.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_MeleeImpact.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_MeleeImpact.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d08501517a52de47613c48bf2c3eb5bd462e151b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/GameplayCues/GCN_Weapon_MeleeImpact.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhenInputPressed.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhenInputPressed.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..288c5f9bd3fa65b3a3f13f0dbf9f4c79716fc27f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhenInputPressed.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhileInputHeld.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhileInputHeld.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a46cd9812a5e2c7eacd63c45f79dc199add95443
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GAB_ShowWidget_WhileInputHeld.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GA_DropWeapon.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GA_DropWeapon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8ca34ebb3979deea26478c09679e4dec97142a7f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/GA_DropWeapon.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/Struct_UIMessaging.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/Struct_UIMessaging.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d7bb3f4bb811891fd3da243868afb7e2e688d221
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Abilities/Struct_UIMessaging.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ADS.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ADS.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a9d59dfa9c06e5fa50996f9f02274f1a2da68c90
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ADS.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_DropWeapon.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_DropWeapon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..20acb747153cb7bd7fc2e3a851857efcb199945d
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_DropWeapon.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Emote.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Emote.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..02f59ae03b6719bb812d39f42a9b6d374f84d763
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Emote.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Grenade.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..af23c75599c9fc34a699405308f9fb121ecd36f6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Grenade.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Melee.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e2234a4570341802fba3ed8b357c697248f6a2db
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_Melee.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot1.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot1.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3bc97e741992ca498a8142620528de267d235128
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot1.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot2.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot2.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e532d613fea6a6cd03e52a03aca779112442057
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot2.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot3.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot3.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a65d65bc2d4452e78fdf3d712cffff094e972ec2
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot3.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleBackward.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleBackward.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..53c5203029f5a64ed77d69c421139d21df8f1e63
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleBackward.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleForward.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleForward.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..46d8a70cd9051ff18b73c5529a770d5208ae427d
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_QuickSlot_CycleForward.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ShowScoreboard.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ShowScoreboard.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ecea3ed493fafaf55c30b5a743150a7065778450
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/IA_ShowScoreboard.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/InputData_ShooterGame_AddOns.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/InputData_ShooterGame_AddOns.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9684febea673c2a1d963baf31bfe11575a80ffd2
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Actions/InputData_ShooterGame_AddOns.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Components/B_AimAssistTargetManager.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Components/B_AimAssistTargetManager.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b64cebb65c4724b4b2a26a6d6fb362a0e1c65b5e
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Components/B_AimAssistTargetManager.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/C_AimAssistTargetWeightCurve.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/C_AimAssistTargetWeightCurve.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c1249d0ae3c28a8270da9de07422af923b1e3621
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/C_AimAssistTargetWeightCurve.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ADS_Speed.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ADS_Speed.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4e58138aedd8dd940df5674405bc59f1189d11b6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ADS_Speed.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d63f18b7be00da04384244570f501e97b3d5e488
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame_KBM.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame_KBM.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..da5d56c43df40ca419afa95424d16518bcd19e1f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Mappings/IMC_ShooterGame_KBM.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Settings/GamepadAimSensitivity_Targeting.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Settings/GamepadAimSensitivity_Targeting.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3371bacb8e128420a96deef979989cbbe63cbbeb
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/Settings/GamepadAimSensitivity_Targeting.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/W_TouchRegion_Left.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/W_TouchRegion_Left.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..da87f9c813c308aaf40b1bc79552f610c6193806
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Input/W_TouchRegion_Left.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_CubeHat.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_CubeHat.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3483320a8cbcaaf829f2a41e0d434fb39e319183
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_CubeHat.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_HealPickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_HealPickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7a155c1d98d67691289de564902eaa9b3858f6bc
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Item/B_HealPickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Big.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Big.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ab51335b9266937892debdc7f31180b2c7ed13c1
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Big.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Part.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Part.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..72ab649fefb45abbd6cf48a2f77e3d34f4ca4955
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Part.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Pickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Pickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..99186818b447f6e7c56439ddabf0c2e79d34ff74
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/GE_InstantHeal_Pickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Big.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Big.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b3397cd11ec9a4aa386de90b2939523fa2132b4d
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Big.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Small.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Small.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c18b0b55256946d939832b621f1922c6b74b32ad
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup/WeaponPickupData_Heal_Small.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/AbilitySet_HealPickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/AbilitySet_HealPickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0ccd85069543bcbd32f86c6db36ce20fa6aa4476
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/AbilitySet_HealPickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/GA_HealPickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/GA_HealPickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1ec547d86f3a8d633c07177785743244b41faf09
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/GA_HealPickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/ID_HealPickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/ID_HealPickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..671b6b3a3664b22b8e7f942b3b1ad6244b31497e
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/ID_HealPickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/WID_HealPickup.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/WID_HealPickup.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..06fb1691a8bb28a14798755245e5452add59aa5b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/HealthPickup_Unused/WID_HealPickup.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/B_PhysicsTest.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/B_PhysicsTest.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bc79ac31b0ec66f00a8f98d8ca699e85493ca649
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/B_PhysicsTest.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/MI_PhysicsTest.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/MI_PhysicsTest.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c280ad2b189b49fa0e6995f751b51f89f012b1d9
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/MI_PhysicsTest.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/SM_1M_Cube.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/SM_1M_Cube.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d84a6254615b366994cb5c8e72256233f61ab414
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Items/PhysicsCube/SM_1M_Cube.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterGym.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterGym.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..921edf583e4f22cc36754bec5d51116550b274f4
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterGym.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterPerf.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterPerf.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..211272450883fce2b56c588b62238f1ed44d8c65
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/System/Playlists/DA_ShooterGame_ShooterPerf.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/MI_UI_AmmoArc.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/MI_UI_AmmoArc.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..97e4c05f30d59dec664fba991958ac30a34ccb3e
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/MI_UI_AmmoArc.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/M_UI_RadialProgress_Ability.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/M_UI_RadialProgress_Ability.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2cbf5cb76766f8b7b1ab1fa4a446ae2b970a447b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/M_UI_RadialProgress_Ability.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_DebugWeaponSpreadWidget.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_DebugWeaponSpreadWidget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..896f83cfb62fbacc3d74cab15d065b8a626fca4b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_DebugWeaponSpreadWidget.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_QuickBar.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_QuickBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e45a77d7cb60670a690986e3fd4cdc843c53c993
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_QuickBar.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Reticle_AmmoBar.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Reticle_AmmoBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..895feeb3bb0481e31d57f1b181a0d72ea14c71ef
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Reticle_AmmoBar.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Temp_ReticleDot.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Temp_ReticleDot.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5ed7a9df886ad7b53d6fb85f80304f875426f27a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/HUD/W_Temp_ReticleDot.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ITakesLyraPlayerState.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ITakesLyraPlayerState.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0d63092f15f4acddb9618208daf4227ae4a02853
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ITakesLyraPlayerState.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/Accolades/W_AccoladeHostWidget.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/Accolades/W_AccoladeHostWidget.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3c33939ab055687d529a318d5e870e441a55e645
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/Accolades/W_AccoladeHostWidget.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/ElimFeedEntry.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/ElimFeedEntry.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e544ee7ad63388d1977741917b9961bca9c0b672
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/ElimFeedEntry.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/EliminationFeedMessage.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/EliminationFeedMessage.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..cdd325df8418673d13be2ca2fa0129dfeb20ba46
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/EliminationFeedMessage.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/W_EliminationFeed.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/W_EliminationFeed.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8993195047ac4747c1718bfb3ee3b35376f3f26f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Notifications/EliminationFeed/W_EliminationFeed.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_PlayerSelector.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_PlayerSelector.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b5d38b4c64ed086347b5b19b0e420a6d636e5977
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_PlayerSelector.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_ScrubBar.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_ScrubBar.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2c2248f383e5827d03fe4987fac411af1b31fb62
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_Replay_ScrubBar.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_ShooterReplayHUD.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_ShooterReplayHUD.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2d106b35f119bce80f40b9409c568cab2bd8f845
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/Replays/W_ShooterReplayHUD.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_BasePlayerRow.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_BasePlayerRow.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c3912861bef53cebd5b7d4d33b89878569c1ca09
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_BasePlayerRow.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerIcon.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerIcon.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..35c837808ed1f1f1e3ade4f2ce05f25e0f83330f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerIcon.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerName.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerName.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ea9cb195163e0e5c4729e56ad1d380e76deed133
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/PlayerRow/W_SB_PlayerName.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/W_UserConnectionStatus.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/W_UserConnectionStatus.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b9c9ec99277aa071aff4f005939711b31a840397
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/ScoreBoard/W_UserConnectionStatus.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_FireButton.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_FireButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f3f71d1594ffdecaed50b86528d0171de06dc737
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_FireButton.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ShooterHUDLayout.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ShooterHUDLayout.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2ec3014c7c2f77db8f38fc14e16092c1eeda3ab3
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ShooterHUDLayout.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ToggleADSTouchButton.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ToggleADSTouchButton.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1d6d632ef5a7c6b5843b4eb801ba87a69f4ce553
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/UserInterface/W_ToggleADSTouchButton.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/GE_Damage_Melee.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/GE_Damage_Melee.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6da8ae9b73143189b4d3db0d0267755fb96ba3e1
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/GE_Damage_Melee.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/Curve_GrenadeDamage.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/Curve_GrenadeDamage.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..96f0243e55a3d2a8af315af1f188ec15dc03676a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/Curve_GrenadeDamage.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GCN_Grenade_Detonate.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GCN_Grenade_Detonate.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c9d9f7623f3e28dad63d3820aa683748718f90df
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GCN_Grenade_Detonate.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Damage_Grenade.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Damage_Grenade.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..eb9079171858583280164c8e2aaf5781ae25bffa
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Damage_Grenade.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Grenade_Cooldown.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Grenade_Cooldown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4dcdac705704b6aad7b57ea84e5102f95e58c0b6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/GE_Grenade_Cooldown.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/W_GrenadeCooldown.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/W_GrenadeCooldown.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..2dfb056c84d0576ebbf03dd76c094e4f5d34a4fe
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Grenade/W_GrenadeCooldown.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/AbilitySet_ShooterNetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/AbilitySet_ShooterNetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c62893de6c8dd49f8ad46a7fde5db18dcfdb0642
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/AbilitySet_ShooterNetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/B_WeaponInstance_NetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/B_WeaponInstance_NetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e8fbf774941c57c1b9ddd67871862498455416a0
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/B_WeaponInstance_NetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/ID_NetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/ID_NetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f5db7868b61e1a7b0e4ba9892fce7f4ac19eadd5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/ID_NetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WID_NetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WID_NetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c1a846ffa66224bc540dd6eee24cdbe14dc366fd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WID_NetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WeaponPickupData_NetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WeaponPickupData_NetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ead9b79b8dff986c2385c866aa1d8a1bd0fa893f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/NetShooter_PROTO/WeaponPickupData_NetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/AbilitySet_ShooterPistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/AbilitySet_ShooterPistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..560709513780166ecc2e5a23076f809c6e58a2a5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/AbilitySet_ShooterPistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..4d6c6510da7a0c8149a293bcb6a23776fcae55fd
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_WeaponInstance_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_WeaponInstance_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c746e01907164108de916201851aa9922373876d
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/B_WeaponInstance_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GA_Weapon_Fire_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GA_Weapon_Fire_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f45e38d00ca5376b2f011cd387f92ea4c3281625
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GA_Weapon_Fire_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GCN_Weapon_Pistol_Fire.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GCN_Weapon_Pistol_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..01641d1e090af20c1ca82dde6cc2a98dcb0f7aad
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/GCN_Weapon_Pistol_Fire.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/ID_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/ID_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1c1098537bea4cfebb407c8c3f865ef0b1405bd9
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/ID_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WID_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WID_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8ab1917d4ba0a1e02a07f7fc8a6ec68b99fa7736
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WID_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WeaponPickupData_Pistol.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WeaponPickupData_Pistol.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..ef88e15c25a30cf9624b7a0844bcf5efacee1c1a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Pistol/WeaponPickupData_Pistol.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/AbilitySet_ShooterRifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/AbilitySet_ShooterRifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fc1078a03e3c08729a1b5082f682fd959697c7ac
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/AbilitySet_ShooterRifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e3b7493b06c8b5db98e290e17ac7e66da4ff5971
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_WeaponInstance_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_WeaponInstance_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..9810ab7acc89c0599f5923d727e9af2cee9e3abb
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/B_WeaponInstance_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Fire_Rifle_Auto.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Fire_Rifle_Auto.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e90f8dec2c81fc57294d158d434b78961356a9a
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Fire_Rifle_Auto.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Reload_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Reload_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3f4792ad249a1e1c02a89d26eb08bb3944bcb05c
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GA_Weapon_Reload_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GCN_Weapon_Rifle_Fire.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GCN_Weapon_Rifle_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..fa20ce25ab25fbbf9afeda97106f6b888df16374
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GCN_Weapon_Rifle_Fire.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GE_Damage_RifleAuto.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GE_Damage_RifleAuto.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..1b1d7976e6a3ad848cc234ba9def0b93b33b1b07
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/GE_Damage_RifleAuto.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/ID_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/ID_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..d11648c6aefc3a775e7e62dbec6da201a3a02276
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/ID_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WID_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WID_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..18170cd23ccabde8d0b51e2b626f86a67d1fa226
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WID_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WeaponPickupData_Rifle.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WeaponPickupData_Rifle.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..b9761edda01c8248f3002d128c505a243f589e4b
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Rifle/WeaponPickupData_Rifle.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/AbilitySet_ShooterShotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/AbilitySet_ShooterShotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..0d104d976b18eded2223936a57e964743eb2f112
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/AbilitySet_ShooterShotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..f72a320b6a469764da66cd45e5dd589504c4a88f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_WeaponInstance_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_WeaponInstance_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..6f930ac67025f99848ea41d6f7fe6b3fa510ddb5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/B_WeaponInstance_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Fire_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Fire_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..535f9e3641ee34e74804a16e2060b04fee856351
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Fire_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_NetShooter.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_NetShooter.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..550289d7158798e31fc3986d043e1c9888fe4346
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_NetShooter.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..8e2cbe5812014b5e2b07ddb55fd22615dff52ac5
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GA_Weapon_Reload_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GCN_Weapon_Shotgun_Fire.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GCN_Weapon_Shotgun_Fire.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..7c582b05b0d8c773f14d0d4914ed3c75a21a50b3
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GCN_Weapon_Shotgun_Fire.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GE_Damage_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GE_Damage_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..3e155dbfddcda1ed21e7ff7f881d05934fabab87
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/GE_Damage_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/ID_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/ID_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..e6be31f7ba0030169d5d0653172fc8bff97e3eb6
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/ID_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WID_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WID_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..a1bdd4d55ec804e6a5d5097650785245ceeea2c4
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WID_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WeaponPickupData_Shotgun.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WeaponPickupData_Shotgun.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..bff66eeeb0321ec144971ac59c32ef479f40366f
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/Shotgun/WeaponPickupData_Shotgun.uasset differ
diff --git a/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/WID_InstantHeal.uasset b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/WID_InstantHeal.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..65884c6fc3e7cfa803075553d82881c931be9d84
Binary files /dev/null and b/LyraStarterGame/Plugins/GameFeatures/ShooterCore/Content/Weapons/WID_InstantHeal.uasset differ