diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset
index 2e59efee..765d07b3 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a62f540e20308f751c7f7dc47df55cd1cdfbc5b282d98c6ac8a14ab472435ea9
-size 1617109
+oid sha256:d36b158f701a6104069875b85b6c4fe3c05d5eaa8b8fc085a5fcc92793010fac
+size 1621595
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset
index b2a1e08d..f5ada6bd 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:005e6f11205fbbf5656d90ea4b6804e9af95ac642dcec5b5d3740db056d27a1c
-size 68446
+oid sha256:78ad2e7ab300f1f1c384a5b0d0511b68d5b284a573dad021da7f6c7fc9d1be9a
+size 67225
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Fire_Montage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Fire_Montage.uasset
index f8db3e03..fc53e633 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Fire_Montage.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Fire_Montage.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2961c7686baaa3352d2ec3b1834cd2519c9618b8a3fe403ce669f1566bbf11eb
-size 8248
+oid sha256:c06e153a450b03775d25dbb08d9e255f7f09109d8e1b37a04dff2e9e949b0a68
+size 8304
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Fire_Montage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Fire_Montage.uasset
index 4446d858..49e04e6f 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Fire_Montage.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Fire_Montage.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b4ef6c3ac9d2cb02eabe627e0798ad08f6422b2a37fa2226f3fbd67c9c0f85c
-size 12626
+oid sha256:aa50227bee51d07575e800a153a333200f32498638363f055f76e5d0a0d75078
+size 12959
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
index 327862c7..518c53ee 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c376963d4b64bc91d577adc4d22d11d19cdd1b57f4d6b6fc0dd0c413442500d
-size 1870493
+oid sha256:79812b300a5492136e269034cadf25a2ee84b9d9483d36a6a0f434f6b2880b64
+size 1871414
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
index 60a9c32b..30beff45 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f02340c0da02bfb790dacbe8198ac2c4acf4d8a1f09519b3ab726a36877924f0
-size 150078
+oid sha256:4b1d08215ff193ef0bc4949423e0301d2a64506e039b7b11015e0ab2a0269175
+size 146510
diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap
index 10bb9043..5f6e1d30 100644
--- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap
+++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9943d610b695c0d592ef1f7b1db30c328fa0b1cc1ee8206ed3a1cf7bda023028
-size 1988094
+oid sha256:993499c1c05bda89d0c1326c67a55fad3d2292de6f7d6019e0802aa319e3c455
+size 1988068
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset
index 52b6548c..f287ac72 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b45245e0703e1db353e7103e5fec3c62113ce8ab21b98ad058ef07321334d327
+oid sha256:6d0cbafab0a0302236982c6bf2541fa4df78ba03c7fdb0bfae5fab0485a4ffb2
 size 6680
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
index 3461898b..8efec37a 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
@@ -483,10 +483,10 @@ void AEndlessVendettaCharacter::EquipPrimary()
 	if (bIsReloading) return;
 	if (IsValid(PrimaryWeapon))
 	{
-		TempUnequippedPrimary();
+		//TempUnequippedPrimary();
 		GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("IsPrimaryWeapon valid check running"));
-		PrimaryWeapon->DetachFromActor(DetatchRules);
-		PrimaryWeapon->AttachToComponent(FirstPersonArms, AttachmentRules, FName("UnEquipGunSocket"));
+		//PrimaryWeapon->DetachFromActor(DetatchRules);
+		//PrimaryWeapon->AttachToComponent(FirstPersonArms, AttachmentRules, FName("UnEquipGunSocket"));
 		PrimaryWeapon->SetActorHiddenInGame(true);
 		PrimaryWeapon->SetActorEnableCollision(false);
 		this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
@@ -516,9 +516,11 @@ void AEndlessVendettaCharacter::EquipPrimary()
 
 		if (!bIsPrimaryWeaponCreated)
 		{
-			PrimaryWeaponActor = GetWorld()->SpawnActor<AActor>(PrimaryWeaponClass, spawnParams);
+			//PrimaryWeaponActor = GetWorld()->SpawnActor<AActor>(PrimaryWeaponClass, spawnParams);
+			HeldWeapon->SetChildActorClass(PrimaryWeaponClass);
+			PrimaryWeaponActor = HeldWeapon->GetChildActor();
 			GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("Spawning weapon"));
-			PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
+			//PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
 			PrimaryWeapon = Cast<ABaseWeaponClass>(PrimaryWeaponActor);
 			PrimaryWeapon->SetActorHiddenInGame(false);
 			PrimaryWeapon->SetActorEnableCollision(false);
@@ -531,15 +533,17 @@ void AEndlessVendettaCharacter::EquipPrimary()
 	if (PrimaryWeaponClass != nullptr)
 	{
 		GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Green, TEXT("non ifstatement code running"));
-		PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
+		//PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
+		HeldWeapon->SetChildActorClass(PrimaryWeaponClass);
+		PrimaryWeaponActor = HeldWeapon->GetChildActor();
 		PrimaryWeapon = Cast<ABaseWeaponClass>(PrimaryWeaponActor);
 		PrimaryWeapon->SetActorHiddenInGame(false);
 		PrimaryWeapon->SetActorEnableCollision(false);
-		GetWorldTimerManager().ClearTimer(PrimaryWeapon->reloadTimerHandle);
+		//GetWorldTimerManager().ClearTimer(PrimaryWeapon->reloadTimerHandle);
 		bIsCurrentlyHoldingWeapon = true;
 		bHasRifle = true;
 		SetOverlayState(EOverlayState::AssaultRifle);
-		TempEquippedPrimary();
+		//TempEquippedPrimary();
 		EquippedWeapon.Broadcast();
 	}
 }
@@ -594,6 +598,8 @@ void AEndlessVendettaCharacter::EquipSecondary()
 	}
 	if (SecondaryWeaponClass != nullptr)
 	{
+		HeldWeapon->SetChildActorClass(SecondaryWeaponClass);
+		SecondaryWeaponActor = HeldWeapon->GetChildActor();
 		SecondaryWeapon = Cast<ABaseWeaponClass>(SecondaryWeaponActor);
 		SecondaryWeapon->SetActorHiddenInGame(false);
 		bIsCurrentlyHoldingWeapon = true;