Patch Set 1: I would prefer that you didn't submit this; Unclean IP, do not check in

(6 inline comments)

Unclean IP due to missing copyright header. Marc said he would clean this up later if its a good direction to follow so this is obviously correctable. :-)