[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns

The full list of commands accepted by this bot can be found here.

The pull request process is described here

@brendandburns the tests seem to fail but not 100% sure why. So something seems funky.

in general, the changes seem great but I would suggest splitting the manual changes and auto generated changes into 2 commits.

/assign @brendandburns

@drubin thanks for review. I forgot to include some new files (forgot git add) so it worked locally, but obviously not remotely (thank goodness for CI/CD :)

Anyway, it's fixed, and I split out the manual changes into their own commit. Please take another look.

Thanks!

/lgtm

Thanks for the quick turnaround and for improving the commits.