Second almost done commit.