Batch runner improvements - working in a basic way now