Batch generation finished

Changes to make it so batch file generation should be complete.  Server
starts up and seem to run. More testing is likely needed.