Bulk of 1.0.0 work