Getting ready to merge changes on desktop and laptop.
Finished merging modified server and config files. Updated dummy server to handle redirected input from files in batch.