groundwork for #313