Batch processing up, refactored some methods.