more progress towards 1.0