Some work on server stuff