Some work for #19.