Move v3 changes to separate branch, fixes #2