Improving Batch code / Loading wheel

Some improved batching logic here, plus the beginning of loading wheel
implementation