More rework and documenting.