Still more progress on 17... More to do...