Server

@bsoetaer 
This is working enough that we can pull it into master.  It's fine if you don't have time for a full review.  I had some merge conflicts when rebasing, so I think merging sooner rather than later is better, to avoid more conflicts.