GM makes a headlight switch that works great. It's a push/pull switch. Go to the Ron Frances Wiring website. Order a free catalog and you'll see all types of switches and knobs, along with countless wiring goodies. Look me up at the Roundup. We'll talk about Abilene, I'm there a lot.
