Thanks @os97673. There's lots more coming in this PR yet!