Progress on #598