initial work for #60