PR Description

What does this fix or add?

Checklist

Tests added
- Good Path
- Error Path
Commits follow conventions described here:
- https://conventionalcommits.org/en/v1.0.0-beta.4/#summary
- https://chris.beams.io/posts/git-commit/#seven-rules
Commits are squashed such that
- There is 1 commit per isolated change
I've not made extraneous commits/changes that are unrelated to my change.