Progress on #644