Good job WildBill!
Be sure to check the ground wire and the kill switch as well. If you've got a manual and a multi meter you'll be able to check the CDI. A word of caution, watch for resistance's that are completely out of wack with what the manual recommends. Its been my experience that a cdi, even new, can give readings outside the service limit and still be in good working order. Variation from the factory service limits could be due to temp, variations in manufacturing ? ? ?
Good luck,
David