I bought an Otterbox and a Pelican, inside are 60 CR123, 20 EneloopXX, 30 L91 and 48 alkies for the lantern and loaner Minimag Pro+. These two cases go inside a foam lined ammo can(lined it myself), where I store 10 lights loose, no cases for them. Two lights are always with me, these go to the can when I rotate my edc.
For the edc bag I have 4 cr123 in a small submersible case.