Progress on #676