Added BatchJob stuff not really working atm