Move shared code into v1.0