Finished, and I should probably commit more often