Progress on #639