initial progress for #1503