Almost done with v1.0