Add @pdl's test file and got first half working.

I think it's at a good discussion point.