Progress on #751