Initial infrastructure for #44