New Server Stuff

Using the new server stuff from Tonic