Added server stuff, not functional