I propose merging it in this stage and iterating systematically with atomic pull requests. Otherwise please create alternative pull request with initial draft and we can iterate from that.