@allspiritseve I just rebased this and fixed a few conflicts. Most of it looks good, but is this right or did my rebase erroneously blow this out?