first pass of v1.0.1