finished converting to abstract weapon organization