more work towards v1