More progress. One more pass and it should be done. Also there...