Add server stuff from sometime