Flesh out most payload refactor updates