Switch for UltraFire 2100

I keep meaning to order one of these for mine, but still waiting for the right light special to show up so I can combine shipping.

Ordered a switch with some misc parts today, looking forward to swapping it into the light. Think I’ll try that o-ring suggestion to allow tailstanding, too.