hadfl: I plan to rebase my commits and clean up my PR branches, but any additional feedback is still welcome. Thanks for the review!!