Yes please, split the PRs, I'll have a look at those asserts