Framework in place for #1781