weapons are now all separate classes