Almost ready to merge.