Has anyone had success finding a battery replacement for the Magicshine 900? I don't want to solder on a new connector if possible. More capacity would be nice, but not necessary. Would like to keep the price ~$50. I know GeoMan is working on replacements.. but I'm getting tired of waiting.