partial work for #63