initial work for #54