Added initial server stuff