Progress towards #60