More work towards #14