initial work on #1063