Add new server functionality for new experiment, new client, some refactoring (mostly Taek's work)
Finish merging/integration of Taek's latest changes into mainline