Wow!! your mod looks great. I was targeting something similar. But now I think giving time and effort to this light will not be worth it. I just did the direct drive mod and I think I will try to use this as a mule light by removing the lens and head completely. The hollow pill screws on directly to the battery segment. I’ll try to give some pics later