all working except dirty tracking of edit vs add