Patch Set 1: No score

I'm fine with the approach being used.  A couple of minor nits below.  But in my opinion, lets do this, and just go ahead and carry out the rest of the work so we can merge it.