Initial concept code for #6