Wait, I just realized, what's the point of a dedicated "Armory" class if we can only upgrade our weapons if we win the bonus challenges? What will our characters be doing all period? And what about people who don't take Armory class? What will the excuse be when their weapons are upgraded? All I can think of is "They're a real tinkerer and found the time and resources necessary to do this solo." But that seems like a stretch for most characters.