Storage is a nonissue since the weapons aren't carried. As I said before, weapons will be allowed to diversify later.