Progress on #648