Split off for weapon experimenting

Splitting off to try to address some weapon issues, especially the shotgun issue