Ok, after an in-person chat everything is fine with what you're doing. There may be minor merging issues when this branch is merged, but it's under control.