Progress on #715