Lots of updates to correlation code to make it a little more flexible.
Added batch_17