Lots more progress