Still not done, but getting close.