Getting there. Now for some serious work on the validation transform. I shudder to think of the ensuing cleanup...