almost done with v1