going to new branch
Almost ready
Edit batch is done for review
Update tests
Merge branch 'edit_batch' into development