Progress towards #236