I updated the PR with our last discussion and I created #145 so we can think/work on that related subject of how all of this extends to Dialog...