As I mentioned in the other PR - all tests pass, and things look good while skimming through it! Will give it a review later this week. :)