Lots of progress, including closing #42, #39, and #34