Started working on edit batch