nearly finished with v1.0