Variable server endpoint

@BRONSOLO this look OK?