More new weapon work

Not sure if 281 ; -1 will work.