initial work for #61