Phew! Thanks for the 411. I spent an insane amount of time comparing my post to others to see if I did it correctly! :P

And, yes, I imagine tagging for this would be wierd. I actually had another story with two versions (one gen and one S/W as well), but I'll save that for another day.