If this approach is what we decide on, I'll open an issue instead of committing an XXX