Progress on #780