I think so. I'll create a draft in a separate branch.