Progress on #811