I really, really love mass combat and having a system for mass combat in D&D. More and more, I think my solution in 5e is to use modified stat blocks that are swarms for units that can represent however many creatures, depending on the scale you're operating at, and switch out the d20 at higher...