Model originally uploaded to Thingiverse at https://www.thingiverse.com/thing:2316567.

This is a design I did a while back for the new 20700 sized batteries. It includes enclosed magnets, enclosure, and battery tray.