@adamv while I've got your attention, any ideas how I might tackle item 5 in the PR description?