Hello, if you are swapping the cdi unit and the spark is following it then I'd say the cdi is goosed. They are a weak spot on the mc16!

If you do a search there is a thread on how to repair them.
_________________
More **** two strokes than you can shake a **** stick at.