Patch Set 1: I would prefer that you didn't submit this

(12 inline comments)

This is still a work in progress, I pushed it out before i ran out the door.  But I would appreciate comments if anyone has any.