Bulk of work on 1.0 done