Looking good.  Thought I might check this in and create a branch now.