Second wave of commit.  I think everything builds.