Should we add both?  I'm wary of breaking existing apps using v1.