Intermediate commit
Working in progress
More unfinished development towards two-phase convergence