Working version
Beginnings of a multi-machine
Support two servers
Force version to make sure we are stable for now