Draft: splicing integration branch

Code here was already reviewed, but should be reviewed again for merge/rebase issues before the merge to main.