More progress. Still not done.