pre v1.0b work commit