OK, wiggled the wires at the bulkhead with no headlights coming on. I then moved the wires at the back of the AMP gauge, now the key switch cranks the engine in neutral and the headlights come on, but still no spark. I'll check the pickup gap for rust.