working progress
Merge branch 'auto-batch' of github.com:JHUISI/charm into auto-batch