Progress on #718