Batch file update

Still may not go with this in the long term, but worth testing this
weekend.