Note: Divij and I had a chat about this offline, and he's cool with committing this as a way of allowing the collab edit to be integrated. With the intention of better design to come.