cc @jjcordz — sorry it took me a bit to get these together!
@marcia are you able to merge? If not feel free to reassign.