Added weapon choice (not 100% complete)