Adding some machine_batch secret sauce

Use machine_batch for great reduction of duplication