Progress on #793