Initial version of batch saving
Saving to batches finished
Fix Shift-Tab bug