More or less finished, I think (and hope)