I got this idea from somewhere here on BLF. Lipstick holder from The Container Store. Works great for 18650 and 21700 batteries.