So option 2 makes sense? I can't think of a good reason why not :) we can draft a PR on Monday/Tuesday