Feature/better batch

Ok, this should do it. New branch for developing batch mode improvements.