started in on weapons classes
merge
merge