Quick update: @renato worked on it at the same time I did and we ended up having two PRs for the same feature.