server 99% ready for experiment. need to finalize file logging and test colluding clients.
Merge origin/master