moved around the weapons class