A bit more progress since last push.