initial work on #718