Committing for now ... I still have a handful of updates to commit.