Progress on #791