Rebuilt a lot of method logic. Is now working again like it was. Still
not converging I guess?